haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 05:28:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

opensound: update patch

Browse Source 
Looks like some fixes I did in 2014 were undone. Also fix more stuff.

Now it builds and works quite well.
This commit is contained in:
François Revol
2017-11-21 17:22:58 +01:00
parent 9ea2b4d8e2
commit 4c90692f7f
1 changed files with 360 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

366
media-sound/opensound/patches/opensound-4.2_git.patchset
View File

@@ -1,7 +1,7 @@
From 736e82cd4b6405d3b9b8cb952dade64cf1f8bd8d Mon Sep 17 00:00:00 2001 From d8152901ee9fefa3d2d6e93f294951c638f1142e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr> From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Thu, 7 Aug 2014 22:20:13 +0200 Date: Thu, 7 Aug 2014 22:20:13 +0200
Subject: [PATCH] Haiku: Fix physical address passing to oss_map_pci_mem() Subject: [PATCH 1/9] Haiku: Fix physical address passing to oss_map_pci_mem()
Avoids sign extension ending in General Protection Exception. Avoids sign extension ending in General Protection Exception.
--- ---
@@ -10,7 +10,7 @@ Avoids sign extension ending in General Protection Exception.
2 files changed, 8 insertions(+), 5 deletions(-) 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c
index 111e6b1..7bec36e 100644 index 08587c5..f29197c 100644
--- a/kernel/OS/BeOS/os_beos.c --- a/kernel/OS/BeOS/os_beos.c
+++ b/kernel/OS/BeOS/os_beos.c +++ b/kernel/OS/BeOS/os_beos.c
@@ -598,17 +598,17 @@ oss_untimeout (timeout_id_t id) @@ -598,17 +598,17 @@ oss_untimeout (timeout_id_t id)
@@ -35,7 +35,7 @@ index 111e6b1..7bec36e 100644
if (err < B_OK) if (err < B_OK)
va = NULL; va = NULL;
diff --git a/kernel/OS/BeOS/os_beos.h b/kernel/OS/BeOS/os_beos.h diff --git a/kernel/OS/BeOS/os_beos.h b/kernel/OS/BeOS/os_beos.h
index 31fd27e..5ee9deb 100644 index 1e8f0b5..f4621e1 100644
--- a/kernel/OS/BeOS/os_beos.h --- a/kernel/OS/BeOS/os_beos.h
+++ b/kernel/OS/BeOS/os_beos.h +++ b/kernel/OS/BeOS/os_beos.h
@@ -101,6 +101,9 @@ typedef uint32 oss_native_word; /* Same as the address and status register size @@ -101,6 +101,9 @@ typedef uint32 oss_native_word; /* Same as the address and status register size
@@ -48,7 +48,7 @@ index 31fd27e..5ee9deb 100644
extern void oss_cmn_err (int level, char *format, ...); extern void oss_cmn_err (int level, char *format, ...);
@@ -413,8 +416,8 @@ typedef struct _oss_poll_event_t oss_poll_event_t; @@ -408,8 +411,8 @@ typedef struct _oss_poll_event_t oss_poll_event_t;
extern int detect_trace; extern int detect_trace;
#define DDB(x) if (detect_trace) x #define DDB(x) if (detect_trace) x
@@ -60,5 +60,359 @@ index 31fd27e..5ee9deb 100644
#define MAP_PCI_IOADDR(osdev, nr, io) (oss_native_word)io #define MAP_PCI_IOADDR(osdev, nr, io) (oss_native_word)io
#define MAP_PCI_MEM(osdev, ix, phaddr, size) oss_map_pci_mem(osdev, ix, phaddr, size) #define MAP_PCI_MEM(osdev, ix, phaddr, size) oss_map_pci_mem(osdev, ix, phaddr, size)
-- --
1.8.3.4 2.15.0
From 035a0250a7d4a5fc34dce12bd33b63651ee0ce35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 08:52:04 +0100
Subject: [PATCH 2/9] Haiku: Fix mutex initialization
Haiku has been defining spinlocks as structs for a while now, unlike BeOS.
---
kernel/OS/BeOS/os_beos.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/kernel/OS/BeOS/os_beos.h b/kernel/OS/BeOS/os_beos.h
index f4621e1..057948e 100644
--- a/kernel/OS/BeOS/os_beos.h
+++ b/kernel/OS/BeOS/os_beos.h
@@ -201,7 +201,13 @@ extern void debug_mutex_exit (oss_mutex_t * mutex, char *file, int line, oss_nat
#define MUTEX_EXIT(mutex, flags) debug_mutex_exit(&mutex, __FILE__, __LINE__, NULL)
#else
typedef spinlock oss_mutex_t;
-#define MUTEX_INIT(osdev, mutex, hier) { mutex = 0; }
+#ifndef __HAIKU__
+/* Haiku defines a specific initializer now, BeOS just used 0. */
+#define B_SPINLOCK_INITIALIZER 0
+#endif
+/* gcc2 does not like this:
+#define MUTEX_INIT(osdev, mutex, hier) { mutex = B_SPINLOCK_INITIALIZER; }*/
+#define MUTEX_INIT(osdev, mutex, hier) { const spinlock s = B_SPINLOCK_INITIALIZER; mutex = s; }
#define MUTEX_CLEANUP(mutex)
#define MUTEX_ENTER_IRQDISABLE(mutex, flags) \
{ \
--
2.15.0
From 0901fc45199f2bcb4f9a749dd4406bc2593b2051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 09:48:20 +0100
Subject: [PATCH 3/9] Haiku: Fix "decimal constant is so large that it is
unsigned" warning
Because Haiku error constants are already negative, and ENOMEM is actually
INT32_MIN, the compiler complains about it.
We force the constants to be unsigned before negating them to shut it up.
Tested in both Linux and Haiku, after configuring the resulting values
are the expected ones:
printf("%s: %d\n", #e, OSS_##e)
int main() {
GEN_ERRNO(E2BIG);
...
}
---
setup/srcconf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup/srcconf.c b/setup/srcconf.c
index 967aed3..300a168 100644
--- a/setup/srcconf.c
+++ b/setup/srcconf.c
@@ -1370,7 +1370,7 @@ produce_errno_h(void)
exit(-1);
}
#define GEN_ERRNO(e) \
- fprintf (f, "#define OSS_"#e"\t\t%d\n", (e<=0) ? e : -(e));
+ fprintf (f, "#define OSS_"#e"\t\t%du\n", (e<=0) ? e : -(e));
fprintf (f, "#ifndef OSS_ERRNO_H\n");
fprintf (f, "#define OSS_ERRNO_H\n");
--
2.15.0
From 9bb90810d582cf56280cd074053c59339b339e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 10:21:08 +0100
Subject: [PATCH 4/9] Haiku: Fix new type for atomics
---
kernel/OS/BeOS/os_beos.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c
index f29197c..3f1366b 100644
--- a/kernel/OS/BeOS/os_beos.c
+++ b/kernel/OS/BeOS/os_beos.c
@@ -70,8 +70,12 @@ benaphore osscore_benaphore;
#define DEBUG_IRQ 1
#if DEBUG_IRQ
+#ifdef __HAIKU__
+int32 irq_count = 0;
+#else
vint32 irq_count = 0;
#endif
+#endif
volatile int oss_open_devices = 0;
#define MAX_CARDS 16
--
2.15.0
From 21693820a85c8154c0cdd8654314b3c74f36a091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 10:22:36 +0100
Subject: [PATCH 5/9] Haiku: Work around PCI->ram_address limitation
Historically it takes a pointer, while it should use a phys_addr_t.
It should be fixed but until then we test for overflow and return directly.
On x86 it's a noop anyway.
---
kernel/OS/BeOS/os_beos.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c
index 3f1366b..0f9f3f6 100644
--- a/kernel/OS/BeOS/os_beos.c
+++ b/kernel/OS/BeOS/os_beos.c
@@ -245,7 +245,11 @@ oss_virt_to_bus (void *addr)
}
//XXX:which???
//return (oss_native_word)pent[0].address;
- return (oss_native_word)(gPCI->ram_address(pent[0].address));
+ //XXX: ram_address historically takes a void* which isn't the same size...
+ // check for overflow, then we just return it, on x86 it's a noop anyway
+ if (sizeof(const void *) < sizeof(phys_addr_t) && ((addr_t)pent[0].address != pent[0].address))
+ return (oss_native_word)pent[0].address;
+ return (oss_native_word)(gPCI->ram_address((const void *)(addr_t)pent[0].address));
}
--
2.15.0
From f794bd178afb1bf60e995b0b72952b464aadcc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 11:21:20 +0100
Subject: [PATCH 6/9] Haiku: build.sh: Fix and make more flexible for packaging
Haiku introduced subtle differences from BeOS...
Actually some of this was already fixed in 2014...
---
setup/BeOS/build.sh | 42 +++++++++++++++++++++++++++---------------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/setup/BeOS/build.sh b/setup/BeOS/build.sh
index 045a599..31ae894 100644
--- a/setup/BeOS/build.sh
+++ b/setup/BeOS/build.sh
@@ -2,10 +2,20 @@
. ./.directories
-#BEOS_SYSTEM=beos/system
-# to install as user addons
-BEOS_SYSTEM=home/config
+# default is to install as user addons
+BEOS_SYSTEM="${BEOS_SYSTEM:-home/config}"
+DRIVER_SETTINGS="${DRIVER_SETTINGS:-home/config/settings/kernel/drivers}"
+
+# the path to the kernel binary we can link to
+if [ $OSTYPE = "haiku" ]; then
+# x86/ would be for secondary arch here
+KERNEL=/system/develop/lib/_KERNEL_
+else
+# BeOS has x86/ and ppc/
+KERNEL=/boot/develop/lib/x86/_KERNEL_
+fi
+# prefix of driver settings files
DRVPREFIX=oss_
rm -rf prototype
@@ -36,16 +46,18 @@ mkdir -p prototype/$BEOS_SYSTEM/add-ons/kernel/media
#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/
+# Avoid loading OSS too early at boot,
+# the media addon will probe /dev/audio/oss anyway
+#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
-mkdir -p prototype/home/Desktop
+mkdir -p prototype/$BEOS_SYSTEM/bin
+mkdir -p prototype/$DRIVER_SETTINGS
+#mkdir -p prototype/home/Desktop
#cp $SRCDIR/include/soundcard.h prototype/usr/include/sys
@@ -55,8 +67,8 @@ mkdir -p prototype/home/Desktop
#cp $SRCDIR/kernel/framework/include/midiparser.h prototype/$OSSLIBDIR/include/
(cd target/bin; rm -f ossrecord; ln -s ossplay ossrecord)
-cp -f target/bin/* prototype/home/config/bin
-cp -f target/sbin/* prototype/home/config/bin
+cp -f target/bin/* prototype/$BEOS_SYSTEM/bin
+cp -f target/sbin/* prototype/$BEOS_SYSTEM/bin
#cp -R $SRCDIR/oss/* prototype/$OSSLIBDIR
@@ -85,7 +97,7 @@ function setvermime () {
#core=prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss/${DRVPREFIX}core
#must match internal module name...
core=prototype/$BEOS_SYSTEM/add-ons/kernel/media/oss
-#gcc -o $drv target/objects/*.o -nostdlib /boot/develop/lib/x86/_KERNEL_ || exit 1
+#gcc -o $drv target/objects/*.o -nostdlib $KERNEL || exit 1
# no midi yet
rm target/modules/oss_midiloop.o
@@ -93,19 +105,19 @@ rm target/modules/oss_midiloop.o
# try to build all in a single bin for now...
# driver_beos.o shouldn' be in, oh well...
# R5 has symbols like __ucmpdi2 but not Haiku, so use libgcc
-gcc -o $core target/objects/*.o target/modules/*.o -nostdlib -lgcc /boot/develop/lib/x86/_KERNEL_ || exit 1
+gcc -o $core target/objects/*.o target/modules/*.o -nostdlib -lgcc $KERNEL || exit 1
setvermime $core
# except the loader driver...
# using the same bin works in BeOS but not in Haiku.
drv=prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin/${DRVPREFIX}loader
-gcc -o $drv target/objects/driver_beos.o -nostdlib /boot/develop/lib/x86/_KERNEL_ || exit 1
+gcc -o $drv target/objects/driver_beos.o -nostdlib $KERNEL || exit 1
setvermime $drv
rm -f devlist.txt
# generate driver settings
-settingspath=prototype/home/config/settings/kernel/drivers
+settingspath=prototype/$DRIVER_SETTINGS
gensettings < kernel/framework/ac97/.params > $settingspath/oss_core
gensettings < kernel/drv/osscore/.params >> $settingspath/oss_core
for n in target/modules/*.o
@@ -142,7 +154,7 @@ do
#ld -r -o prototype/$OSSLIBDIR/modules/$N/Driver.o $n
#drv=prototype/$BEOS_SYSTEM/add-ons/kernel/drivers/bin/${DRVPREFIX}$N
- #gcc -o $drv $n -nostdlib /boot/develop/lib/x86/_KERNEL_ || exit 1
+ #gcc -o $drv $n -nostdlib $KERNEL || exit 1
#longver="`cat .version`"
#shortver="${longver%% *}"
#appver="${shortver:0:1} ${shortver:0:1} 0 b ${shortver##*[a-z]}"
--
2.15.0
From 07719c25dcc90de43a86652d545160e633bc0a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 12:00:47 +0100
Subject: [PATCH 7/9] Haiku: Fix installing paths
When creating a package, we expect stuff outside of /boot...
---
setup/BeOS/build.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup/BeOS/build.sh b/setup/BeOS/build.sh
index 31ae894..dba8bf5 100644
--- a/setup/BeOS/build.sh
+++ b/setup/BeOS/build.sh
@@ -3,8 +3,8 @@
. ./.directories
# default is to install as user addons
-BEOS_SYSTEM="${BEOS_SYSTEM:-home/config}"
-DRIVER_SETTINGS="${DRIVER_SETTINGS:-home/config/settings/kernel/drivers}"
+BEOS_SYSTEM="${BEOS_SYSTEM:-boot/home/config}"
+DRIVER_SETTINGS="${DRIVER_SETTINGS:-boot/home/config/settings/kernel/drivers}"
# the path to the kernel binary we can link to
if [ $OSTYPE = "haiku" ]; then
--
2.15.0
From 8562af6deb4d259cc47c077426d6c8a123f45349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 13:11:13 +0100
Subject: [PATCH 8/9] Haiku: make sure we preserve symlinks on installing
---
setup/BeOS/make.local | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/setup/BeOS/make.local b/setup/BeOS/make.local
index ca403e9..8b8a101 100644
--- a/setup/BeOS/make.local
+++ b/setup/BeOS/make.local
@@ -2,7 +2,10 @@ build: kernel/framework/include/buildid.h all
sh build.sh
copy: build
- cp -R prototype/* /boot/
+ (cd prototype; find -P . -type d | xargs -i{} mkdir -p ${DESTDIR}/{})
+ (cd prototype; find -P . -type f | xargs -i{} cp {} ${DESTDIR}/{})
+ (cd prototype; find -P . -type l | xargs -i{} cp -d {} ${DESTDIR}/{})
+
package: build
sh setup/BeOS/mkpkg.sh
--
2.15.0
From 744a138dfaf9b34dcf74eef1eadcbd17488e9a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 21 Nov 2017 15:58:22 +0100
Subject: [PATCH 9/9] Haiku: only make an osdev available when pci reservation
worked
This was fixed in 2014 in f60489 then undone in 58f453 for some reason...
Added a comment to make it more obvious.
---
kernel/OS/BeOS/os_beos.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/OS/BeOS/os_beos.c b/kernel/OS/BeOS/os_beos.c
index 0f9f3f6..f7e9883 100644
--- a/kernel/OS/BeOS/os_beos.c
+++ b/kernel/OS/BeOS/os_beos.c
@@ -1065,7 +1065,8 @@ osdev_create (dev_info_t * dip, int dev_type, int instance, const char *nick,
osdev->dip = dip;
//osdev->osid = dip;
osdev->unloaded = 0;
- osdev->available = 1;
+ // not until we're sure the device reservation worked!!!
+ //osdev->available = 1;
osdev->first_mixer = -1;
osdev->instance = instance;
osdev->dev_type = dev_type;
@@ -1104,6 +1105,8 @@ osdev_create (dev_info_t * dip, int dev_type, int instance, const char *nick,
return NULL;
}
+ osdev->available = 1;
+
/*
* Create the device handle
*/
--
2.15.0