Skip to content

L
linux
Commit b4f428ee authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] #if abuse is sound/* 

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 66390192
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
include/sound/asound.h
View file @ b4f428ee
...@@ -33,13 +33,15 @@ ...@@ -33,13 +33,15 @@
#include <linux/time.h> #include <linux/time.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#if __LITTLE_ENDIAN == 1234 #ifdef __LITTLE_ENDIAN
#define SNDRV_LITTLE_ENDIAN #define SNDRV_LITTLE_ENDIAN
#elif __BIG_ENDIAN == 4321 #else
#ifdef __BIG_ENDIAN
#define SNDRV_BIG_ENDIAN #define SNDRV_BIG_ENDIAN
#else #else
#error "Unsupported endian..." #error "Unsupported endian..."
#endif #endif
#endif
#else /* !__KERNEL__ */ #else /* !__KERNEL__ */
......
sound/drivers/serial-u16550.c
View file @ b4f428ee
...@@ -674,7 +674,7 @@ static void snd_uart16550_output_write(snd_rawmidi_substream_t * substream) ...@@ -674,7 +674,7 @@ static void snd_uart16550_output_write(snd_rawmidi_substream_t * substream)
break; break;
if (snd_rawmidi_transmit(substream, &midi_byte, 1) != 1) if (snd_rawmidi_transmit(substream, &midi_byte, 1) != 1)
break; break;
#if SNDRV_SERIAL_MS124W_MB_NOCOMBO #ifdef SNDRV_SERIAL_MS124W_MB_NOCOMBO
/* select exactly one of the four ports */ /* select exactly one of the four ports */
addr_byte = (1 << (substream->number + 4)) | 0x08; addr_byte = (1 << (substream->number + 4)) | 0x08;
#else #else
......
sound/oss/aci.c
View file @ b4f428ee
...@@ -99,7 +99,7 @@ MODULE_PARM(wss,"i"); ...@@ -99,7 +99,7 @@ MODULE_PARM(wss,"i");
MODULE_PARM_DESC(wss,"change between ACI/WSS-mixer; use 0 and 1 - untested" MODULE_PARM_DESC(wss,"change between ACI/WSS-mixer; use 0 and 1 - untested"
" default: do nothing; for PCM1-pro only"); " default: do nothing; for PCM1-pro only");
#if DEBUG #ifdef DEBUG
static void print_bits(unsigned char c) static void print_bits(unsigned char c)
{ {
int j; int j;
...@@ -184,7 +184,7 @@ static int busy_wait(void) ...@@ -184,7 +184,7 @@ static int busy_wait(void)
static inline int aci_rawwrite(unsigned char byte) static inline int aci_rawwrite(unsigned char byte)
{ {
if (busy_wait() >= 0) { if (busy_wait() >= 0) {
#if DEBUG #ifdef DEBUG
printk(KERN_DEBUG "aci_rawwrite(%d)\n", byte); printk(KERN_DEBUG "aci_rawwrite(%d)\n", byte);
#endif #endif
outb(byte, COMMAND_REGISTER); outb(byte, COMMAND_REGISTER);
...@@ -199,7 +199,7 @@ static inline int aci_rawread(void) ...@@ -199,7 +199,7 @@ static inline int aci_rawread(void)
if (busy_wait() >= 0) { if (busy_wait() >= 0) {
byte=inb(STATUS_REGISTER); byte=inb(STATUS_REGISTER);
#if DEBUG #ifdef DEBUG
printk(KERN_DEBUG "%d = aci_rawread()\n", byte); printk(KERN_DEBUG "%d = aci_rawread()\n", byte);
#endif #endif
return byte; return byte;
......
sound/pci/azt3328.c
View file @ b4f428ee
...@@ -843,7 +843,7 @@ static int snd_azf3328_playback_trigger(snd_pcm_substream_t * substream, int cmd ...@@ -843,7 +843,7 @@ static int snd_azf3328_playback_trigger(snd_pcm_substream_t * substream, int cmd
snd_azf3328_setdmaa(chip, runtime->dma_addr, snd_pcm_lib_period_bytes(substream), snd_pcm_lib_buffer_bytes(substream), 0); snd_azf3328_setdmaa(chip, runtime->dma_addr, snd_pcm_lib_period_bytes(substream), snd_pcm_lib_buffer_bytes(substream), 0);
spin_lock_irqsave(&chip->reg_lock, flags); spin_lock_irqsave(&chip->reg_lock, flags);
#if WIN9X #ifdef WIN9X
/* FIXME: enable playback/recording??? */ /* FIXME: enable playback/recording??? */
status1 |= DMA_PLAY_SOMETHING1 | DMA_PLAY_SOMETHING2; status1 |= DMA_PLAY_SOMETHING1 | DMA_PLAY_SOMETHING2;
outw(status1, chip->codec_port+IDX_IO_PLAY_FLAGS); outw(status1, chip->codec_port+IDX_IO_PLAY_FLAGS);
...@@ -933,7 +933,7 @@ static int snd_azf3328_capture_trigger(snd_pcm_substream_t * substream, int cmd) ...@@ -933,7 +933,7 @@ static int snd_azf3328_capture_trigger(snd_pcm_substream_t * substream, int cmd)
snd_azf3328_setdmaa(chip, runtime->dma_addr, snd_pcm_lib_period_bytes(substream), snd_pcm_lib_buffer_bytes(substream), 1); snd_azf3328_setdmaa(chip, runtime->dma_addr, snd_pcm_lib_period_bytes(substream), snd_pcm_lib_buffer_bytes(substream), 1);
spin_lock_irqsave(&chip->reg_lock, flags); spin_lock_irqsave(&chip->reg_lock, flags);
#if WIN9X #ifdef WIN9X
/* FIXME: enable playback/recording??? */ /* FIXME: enable playback/recording??? */
status1 |= DMA_PLAY_SOMETHING1 | DMA_PLAY_SOMETHING2; status1 |= DMA_PLAY_SOMETHING1 | DMA_PLAY_SOMETHING2;
outw(status1, chip->codec_port+IDX_IO_REC_FLAGS); outw(status1, chip->codec_port+IDX_IO_REC_FLAGS);
...@@ -993,7 +993,7 @@ static snd_pcm_uframes_t snd_azf3328_playback_pointer(snd_pcm_substream_t * subs ...@@ -993,7 +993,7 @@ static snd_pcm_uframes_t snd_azf3328_playback_pointer(snd_pcm_substream_t * subs
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->reg_lock, flags); spin_lock_irqsave(&chip->reg_lock, flags);
#if QUERY_HARDWARE #ifdef QUERY_HARDWARE
bufptr = inl(chip->codec_port+IDX_IO_PLAY_DMA_START_1); bufptr = inl(chip->codec_port+IDX_IO_PLAY_DMA_START_1);
#else #else
bufptr = substream->runtime->dma_addr; bufptr = substream->runtime->dma_addr;
...@@ -1016,7 +1016,7 @@ static snd_pcm_uframes_t snd_azf3328_capture_pointer(snd_pcm_substream_t * subst ...@@ -1016,7 +1016,7 @@ static snd_pcm_uframes_t snd_azf3328_capture_pointer(snd_pcm_substream_t * subst
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&chip->reg_lock, flags); spin_lock_irqsave(&chip->reg_lock, flags);
#if QUERY_HARDWARE #ifdef QUERY_HARDWARE
bufptr = inl(chip->codec_port+IDX_IO_REC_DMA_START_1); bufptr = inl(chip->codec_port+IDX_IO_REC_DMA_START_1);
#else #else
bufptr = substream->runtime->dma_addr; bufptr = substream->runtime->dma_addr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7