From f5ff88dca23b1b8f4b9287fb7c59959eb976a808 Mon Sep 17 00:00:00 2001
From: Alexander Polakov <polachok@gmail.com>
Date: Sat, 11 Jul 2009 01:35:56 +0400
Subject: [PATCH] Move isonum_ declaration to iso.h

---
 lib/libstand/cd9660.c      |   13 -------------
 sys/config/GENERIC         |    1 +
 sys/vfs/isofs/cd9660/iso.h |   17 +++++++++++++++++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/libstand/cd9660.c b/lib/libstand/cd9660.c
index 77ceb2c..8f2a990 100644
--- a/lib/libstand/cd9660.c
+++ b/lib/libstand/cd9660.c
@@ -117,19 +117,6 @@ struct ptable_ent {
 
 #define	cdb2devb(bno)	((bno) * ISO_DEFAULT_BLOCK_SIZE / DEV_BSIZE)
 
-/* XXX these should be in the system headers */
-static __inline int
-isonum_722(u_char *p)
-{
-	return (*p << 8)|p[1];
-}
-
-static __inline int
-isonum_732(u_char *p)
-{
-	return (*p << 24)|(p[1] << 16)|(p[2] << 8)|p[3];
-}
-
 static ISO_SUSP_HEADER *
 susp_lookup_record(struct open_file *f, const char *identifier,
     struct iso_directory_record *dp, int lenskip)
diff --git a/sys/config/GENERIC b/sys/config/GENERIC
index ed5a573..bb8f5f2 100644
--- a/sys/config/GENERIC
+++ b/sys/config/GENERIC
@@ -68,6 +68,7 @@ options 	INVARIANTS
 
 # ACPI options
 #options 	ACPI_QUIRK_VMWARE	# VMware's ACPI-fast24 timer is broken
+options 	ACPI_ENABLE_PCI
 
 device		isa
 device		eisa
diff --git a/sys/vfs/isofs/cd9660/iso.h b/sys/vfs/isofs/cd9660/iso.h
index a1ad595..2a59af0 100644
--- a/sys/vfs/isofs/cd9660/iso.h
+++ b/sys/vfs/isofs/cd9660/iso.h
@@ -291,6 +291,23 @@ isonum_712(unsigned char *p)
         return p[0];
 }
 
+isonum_713(unsigned char *p)
+{
+        return p[0];
+}
+
+static __inline uint16_t
+isonum_721(unsigned char *p)
+{
+        return (p[0] | p[1] << 8);
+}
+
+static __inline uint16_t
+isonum_722(unsigned char *p)
+{
+        return (p[1] | p[0] << 8);
+}
+
 static __inline uint16_t
 isonum_723(unsigned char *p)
 {
-- 
1.7.7.2