Skip to contentSkip to conversation

move OSS ac97_codec.h to sound/oss/

PATCH In review Adrian Bunk 5 participants 6 messages Nov 30, 2004 Sound

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 move OSS ac97_codec.h to sound/oss/

As far as I can see, there's no good reason why the OSS ac97_codec.h lives in include/linux/ .

diffstat output:

 include/linux/ac97_codec.h     |  340 ---------------------------------
 sound/oss/ac97_codec.c         |    2 
 sound/oss/ac97_codec.h         |  340 +++++++++++++++++++++++++++++++++
 sound/oss/ac97_plugin_ad1980.c |    2 
 sound/oss/ad1889.c             |    2 
 sound/oss/ali5455.c            |    2 
 sound/oss/au1000.c             |    2 
 sound/oss/cs46xx.c             |    2 
 sound/oss/emu10k1/hwaccess.h   |    2 
 sound/oss/es1371.c             |    2 
 sound/oss/forte.c              |    2 
 sound/oss/i810_audio.c         |    2 
 sound/oss/ite8172.c            |    2 
 sound/oss/maestro3.c           |    2 
 sound/oss/nec_vrc5477.c        |    2 
 sound/oss/swarm_cs4297a.c      |    2 
 sound/oss/trident.c            |    2 
 sound/oss/via82cxxx_audio.c    |    2 
 sound/oss/ymfpci.c             |    2 
 19 files changed, 357 insertions(+), 357 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
sound/oss/ac97_plugin_ad1980.c renamed from sound/oss/ac97_plugin_ad1980.c.old +1 -1
@@ -32,7 +32,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 
 /**
  *	ad1980_remove		-	codec remove callback
sound/oss/cs46xx.c renamed from sound/oss/cs46xx.c.old +1 -1
@@ -89,7 +89,7 @@
 #include <linux/bitops.h>
 #include <linux/init.h>
 #include <linux/poll.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 
 #include <asm/io.h>
 #include <asm/dma.h>
sound/oss/emu10k1/hwaccess.h renamed from sound/oss/emu10k1/hwaccess.h.old +1 -1
@@ -35,7 +35,7 @@
 #include <linux/fs.h>
 #include <linux/sound.h>
 #include <linux/soundcard.h>
-#include <linux/ac97_codec.h>
+#include "../ac97_codec.h"
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
sound/oss/ac97_codec.c renamed from sound/oss/ac97_codec.c.old +1 -1
@@ -53,7 +53,7 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <asm/uaccess.h>
 
 #define CODEC_ID_BUFSZ 14
sound/oss/ite8172.c renamed from sound/oss/ite8172.c.old +1 -1
@@ -69,7 +69,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/dma.h>
sound/oss/via82cxxx_audio.c renamed from sound/oss/via82cxxx_audio.c.old +1 -1
@@ -31,7 +31,7 @@
 #include <linux/sound.h>
 #include <linux/poll.h>
 #include <linux/soundcard.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
sound/oss/ad1889.c renamed from sound/oss/ad1889.c.old +1 -1
@@ -35,7 +35,7 @@
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/soundcard.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/sound.h>
 #include <linux/interrupt.h>
sound/oss/forte.c renamed from sound/oss/forte.c.old +1 -1
@@ -39,7 +39,7 @@
 #include <linux/poll.h>
 
 #include <linux/sound.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/interrupt.h>
 
 #include <linux/proc_fs.h>
sound/oss/swarm_cs4297a.c renamed from sound/oss/swarm_cs4297a.c.old +1 -1
@@ -67,7 +67,7 @@
 #include <linux/sound.h>
 #include <linux/slab.h>
 #include <linux/soundcard.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/pci.h>
 #include <linux/bitops.h>
 #include <linux/interrupt.h>
sound/oss/ymfpci.c renamed from sound/oss/ymfpci.c.old +1 -1
@@ -61,7 +61,7 @@
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/soundcard.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/sound.h>
 
 #include <asm/io.h>
sound/oss/au1000.c renamed from sound/oss/au1000.c.old +1 -1
@@ -65,7 +65,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/wrapper.h>
 #include <linux/interrupt.h>
 #include <asm/io.h>
sound/oss/nec_vrc5477.c renamed from sound/oss/nec_vrc5477.c.old +1 -1
@@ -77,7 +77,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/dma.h>
sound/oss/es1371.c renamed from sound/oss/es1371.c.old +1 -1
@@ -125,7 +125,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/gameport.h>
 #include <linux/wait.h>
sound/oss/i810_audio.c renamed from sound/oss/i810_audio.c.old +1 -1
@@ -98,7 +98,7 @@
 #include <linux/poll.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/bitops.h>
 #include <asm/uaccess.h>
sound/oss/trident.c renamed from sound/oss/trident.c.old +1 -1
@@ -209,7 +209,7 @@
 #include <linux/poll.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/bitops.h>
 #include <linux/proc_fs.h>
 #include <linux/interrupt.h>
sound/oss/ali5455.c renamed from sound/oss/ali5455.c.old +1 -1
@@ -62,7 +62,7 @@
 #include <linux/poll.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/interrupt.h>
 #include <asm/uaccess.h>
sound/oss/maestro3.c renamed from sound/oss/maestro3.c.old +1 -1
@@ -142,7 +142,7 @@
 #include <linux/poll.h>
 #include <linux/reboot.h>
 #include <linux/spinlock.h>
-#include <linux/ac97_codec.h>
+#include "ac97_codec.h"
 #include <linux/wait.h>
 
 #include <asm/io.h>
include/linux/ac97_codec.h deleted +0 -340

340 lines not on this page · raw message

sound/oss/ac97_codec.h new file +340 -0

340 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · Adrian Bunk

As far as I can see, there's no good reason why the OSS ac97_codec.h lives in include/linux/ .

Except for a bunch of constants defined there. Are you sure that they are not exposed to userland?

author
#2 lore raw
Quoted 6 lines · Al Viro
Quoted 2 lines · Adrian Bunk

As far as I can see, there's no good reason why the OSS ac97_codec.h lives in include/linux/ .

Except for a bunch of constants defined there. Are you sure that they are not exposed to userland?

A userspace program that has OSS ac97 specific code? I didn't find one.

cu
Adrian

BTW: OSS and ALSA managed to give different names to several of these
constants...

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
Acked-by
#3 lore raw
In reply to Al Viro
Quoted 6 lines · Al Viro
Quoted 2 lines · Adrian Bunk

As far as I can see, there's no good reason why the OSS ac97_codec.h lives in include/linux/ .

Except for a bunch of constants defined there. Are you sure that they are not exposed to userland?

OSS never really exposed raw AC97 to user space. Probably it should have for the whacky corner cases and for stuff like AC97 digitizers.

Acked-by Alan Cox <[email protected]>
#4 lore raw
Quoted 6 lines · Alan Cox
Quoted 4 lines · Al Viro
Quoted 1 line · Adrian Bunk

As far as I can see, there's no good reason why the OSS ac97_codec.h lives in include/linux/ .

Quoted 8 lines
Quoted 2 lines

Except for a bunch of constants defined there. Are you sure that they are not exposed to userland?

OSS never really exposed raw AC97 to user space. Probably it should have for the whacky corner cases and for stuff like AC97 digitizers.

Acked-by Alan Cox <[email protected]>

Disagreement-from: Jeff Garzik <[email protected]>

The reason why ac97_codec.h is in include/linux is because it provides a __public interface__.

Adrian's change

(a) makes it difficult to work on OSS drivers outside sound/oss

(b) increases the pain level of keeping 2.4 and 2.6 drivers in sync -- something that I am doing to i810_audio at least.

ac97_codec.h should stay where it is, until OSS drivers are removed from the tree.

Jeff

#5 lore raw
In reply to Adrian Bunk

On Tue, Nov 30, 2004 at 02:31:39AM +0100, Adrian Bunk wrote:
--- linux-2.6.10-rc2-mm3-full/sound/oss/emu10k1/hwaccess.h.old 2004-11-30 02:11:21.000000000 +0100

sound/oss/emu10k1/hwaccess.h line 38

Quoted 7 lines

+++ linux-2.6.10-rc2-mm3-full/sound/oss/emu10k1/hwaccess.h 2004-11-30 02:12:16.000000000 +0100

sound/oss/emu10k1/hwaccess.h renamed from sound/oss/emu10k1/hwaccess.h.old +1 -1
@@ -35,7 +35,7 @@
 #include <linux/fs.h>
 #include <linux/sound.h>
 #include <linux/soundcard.h>
-#include <linux/ac97_codec.h>
+#include "../ac97_codec.h"

Such relative includes should be avoided. Set CFLAGS_xxx.o in Makefile instead. And move include down under #include <asm/xxx>

Sam