Added patch from François to fix some problems with opensound-cac211efd60d

This commit is contained in:
Chris Roberts
2010-05-08 22:35:53 +00:00
parent 78991b711d
commit a8c4e57340
2 changed files with 31 additions and 0 deletions

View File

@@ -15,6 +15,7 @@ BUILD {
INSTALL {
cd opensound-cac211efd60d/build
if [ -n "${DESTDIR}" ];then
make package
mkdir -p ${DESTDIR}/boot
cp -R prototype/* ${DESTDIR}/boot
else

View File

@@ -0,0 +1,30 @@
diff -up opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c.orig opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c
--- opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c.orig 2010-05-08 16:22:20.327417856 -0600
+++ opensound-cac211efd60d/kernel/OS/BeOS/os_beos.c 2010-05-08 16:23:05.004194304 -0600
@@ -1076,6 +1076,8 @@ osdev_create (dev_info_t * dip, int dev_
osdev->dip->pciinfo.function,
"oss", osdev) != B_OK) {
cmn_err (CE_WARN, "Could not reserve PCI device\n");
+ /* make sure the card isn't uninitialized on driver unload */
+ oss_num_cards--;
/* XXX: CLEANUP! */
return NULL;
}
diff -up opensound-cac211efd60d/setup/BeOS/build.sh.orig opensound-cac211efd60d/setup/BeOS/build.sh
--- opensound-cac211efd60d/setup/BeOS/build.sh.orig 2010-05-08 16:22:21.177471488 -0600
+++ opensound-cac211efd60d/setup/BeOS/build.sh 2010-05-08 16:23:17.108003328 -0600
@@ -36,12 +36,12 @@ mkdir -p prototype/$BEOS_SYSTEM/add-ons/
#hack for now
#mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss
mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin
-mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
+#mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/multi
mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/audio/oss
#hack for now
mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss
ln -s ../../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/oss/
-ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
+#ln -s ../bin/${DRVPREFIX}loader prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/dev/
#hack: install bins for now
mkdir -p prototype/home/config/bin
mkdir -p prototype/home/config/settings/kernel/drivers