sound/pci: coding style fixes: sound/pci/a*
Subsystems (2)
PATCH 3/24 sound/pci: coding style fixes: sound/pci/a*
- <asm/io.h> -> <linux/io.h>
- remove trailing whitespaces
- convert comments
Only compile tested.
Signed-off-by Alexander Beregalov <[email protected]>
---
sound/pci/ad1889.c | 116 +++++++++++++++++++++--------------------- sound/pci/ak4531_codec.c | 14 +++--- sound/pci/als300.c | 16 +++--- sound/pci/als4000.c | 70 +++++++++++++------------- sound/pci/atiixp.c | 64 ++++++++++++------------ sound/pci/atiixp_modem.c | 46 +++++++++--------- sound/pci/aw2/aw2-alsa.c | 2 +- sound/pci/aw2/aw2-saa7146.c | 2 +- sound/pci/azt3328.c | 12 ++-- sound/pci/azt3328.h | 6 +- 10 files changed, 174 insertions(+), 174 deletions(-)
sound/pci/ad1889.c +58 -58
@@ -45,7 +45,7 @@#include <sound/initval.h> #include <sound/ac97_codec.h> -#include <asm/io.h> +#include <linux/io.h> #include "ad1889.h" #include "ac97/ac97_id.h"
@@ -137,7 +137,7 @@ static inline void ad1889_unmute(struct snd_ad1889 *chip) {u16 st; - st =ad1889_readw (chip,AD_DS_WADA ) & + st =ad1889_readw (chip,AD_DS_WADA ) & ~(AD_DS_WADA_RWAM |AD_DS_WADA_LWAM );ad1889_writew (chip,AD_DS_WADA , st);ad1889_readw (chip,AD_DS_WADA );
@@ -198,13 +198,13 @@ static void ad1889_channel_reset(struct snd_ad1889 *chip, unsigned int channel) {u16 reg; - +if (channel &AD_CHAN_WAV ) {/* Disable wave channel */ reg =ad1889_readw (chip,AD_DS_WSMC ) & ~AD_DS_WSMC_WAEN ;ad1889_writew (chip,AD_DS_WSMC , reg); chip->wave.reg = reg; - +/* disable IRQs */ reg =ad1889_readw (chip,AD_DMA_WAV ); reg &=AD_DMA_IM_DIS ;
@@ -219,7 +219,7 @@ ad1889_channel_reset(struct snd_ad1889 *chip, unsigned int channel)/* flush */ ad1889_readw (chip,AD_DMA_WAV ); } - +if (channel &AD_CHAN_ADC ) {/* Disable ADC channel */ reg =ad1889_readw (chip,AD_DS_RAMC ) & ~AD_DS_RAMC_ADEN ;
@@ -230,7 +230,7 @@ ad1889_channel_reset(struct snd_ad1889 *chip, unsigned int channel) reg &=AD_DMA_IM_DIS ; reg &= ~AD_DMA_LOOP ;ad1889_writew (chip,AD_DMA_ADC , reg); - +ad1889_load_adc_buffer_address (chip,0x0 );ad1889_load_adc_buffer_count (chip,0x0 );ad1889_load_adc_interrupt_count (chip,0x0 );
@@ -258,8 +258,8 @@ static int snd_ad1889_ac97_ready(struct snd_ad1889 *chip) {int retry =400 ;/* average needs 352 msec */ - -while (!(ad1889_readw (chip,AD_AC97_ACIC ) &AD_AC97_ACIC_ACRDY ) + +while (!(ad1889_readw (chip,AD_AC97_ACIC ) &AD_AC97_ACIC_ACRDY ) && --retry)mdelay (1 );if (!retry) {
@@ -272,11 +272,11 @@ snd_ad1889_ac97_ready(struct snd_ad1889 *chip)return 0 ; } -static int +static int snd_ad1889_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *hw_params) { -return snd_pcm_lib_malloc_pages (substream, +return snd_pcm_lib_malloc_pages (substream,params_buffer_bytes (hw_params)); }
@@ -372,7 +372,7 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)ad1889_channel_reset (chip,AD_CHAN_WAV ); reg =ad1889_readw (chip,AD_DS_WSMC ); - +/* Mask out 16-bit / Stereo */ reg &= ~(AD_DS_WSMC_WA16 |AD_DS_WSMC_WAST );
@@ -384,13 +384,13 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)/* let's make sure we don't clobber ourselves */ spin_lock_irq (&chip->lock); - + chip->wave.size = size; chip->wave.reg = reg; chip->wave.addr = rt->dma_addr;ad1889_writew (chip,AD_DS_WSMC , chip->wave.reg); - +/* Set sample rates on the codec */ ad1889_writew (chip,AD_DS_WAS , rt->rate);
@@ -401,9 +401,9 @@ snd_ad1889_playback_prepare(struct snd_pcm_substream *ss)/* writes flush */ ad1889_readw (chip,AD_DS_WSMC ); - +spin_unlock_irq (&chip->lock); - +ad1889_debug ("prepare playback: addr = 0x%x, count = %u, " "size = %u, reg = 0x%x, rate = %u\n" , chip->wave.addr, count, size, reg, rt->rate);
@@ -420,7 +420,7 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)u16 reg;ad1889_channel_reset (chip,AD_CHAN_ADC ); - + reg =ad1889_readw (chip,AD_DS_RAMC );/* Mask out 16-bit / Stereo */
@@ -434,7 +434,7 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)/* let's make sure we don't clobber ourselves */ spin_lock_irq (&chip->lock); - + chip->ramc.size = size; chip->ramc.reg = reg; chip->ramc.addr = rt->dma_addr;
@@ -448,9 +448,9 @@ snd_ad1889_capture_prepare(struct snd_pcm_substream *ss)/* writes flush */ ad1889_readw (chip,AD_DS_RAMC ); - +spin_unlock_irq (&chip->lock); - +ad1889_debug ("prepare capture: addr = 0x%x, count = %u, " "size = %u, reg = 0x%x, rate = %u\n" , chip->ramc.addr, count, size, reg, rt->rate);
@@ -466,7 +466,7 @@ snd_ad1889_playback_trigger(struct snd_pcm_substream *ss, int cmd) {u16 wsmc;struct snd_ad1889 *chip =snd_pcm_substream_chip (ss); - + wsmc =ad1889_readw (chip,AD_DS_WSMC );switch (cmd) {
@@ -486,9 +486,9 @@ snd_ad1889_playback_trigger(struct snd_pcm_substream *ss, int cmd)snd_BUG ();return -EINVAL ; } - + chip->wave.reg = wsmc; -ad1889_writew (chip,AD_DS_WSMC , wsmc); +ad1889_writew (chip,AD_DS_WSMC , wsmc);ad1889_readw (chip,AD_DS_WSMC );/* flush */ /* reset the chip when STOP - will disable IRQs */
@@ -509,7 +509,7 @@ snd_ad1889_capture_trigger(struct snd_pcm_substream *ss, int cmd)struct snd_ad1889 *chip =snd_pcm_substream_chip (ss); ramc =ad1889_readw (chip,AD_DS_RAMC ); - +switch (cmd) {case SNDRV_PCM_TRIGGER_START :/* enable DMA loop & interrupts */
@@ -524,15 +524,15 @@ snd_ad1889_capture_trigger(struct snd_pcm_substream *ss, int cmd)default :return -EINVAL ; } - + chip->ramc.reg = ramc; -ad1889_writew (chip,AD_DS_RAMC , ramc); +ad1889_writew (chip,AD_DS_RAMC , ramc);ad1889_readw (chip,AD_DS_RAMC );/* flush */ - +/* reset the chip when STOP - will disable IRQs */ if (cmd ==SNDRV_PCM_TRIGGER_STOP )ad1889_channel_reset (chip,AD_CHAN_ADC ); - +return 0 ; }
@@ -548,10 +548,10 @@ snd_ad1889_playback_pointer(struct snd_pcm_substream *ss) ptr =ad1889_readl (chip,AD_DMA_WAVCA ); ptr -= chip->wave.addr; - +if (snd_BUG_ON (ptr >= chip->wave.size))return 0 ; - +return bytes_to_frames (ss->runtime, ptr); }
@@ -570,7 +570,7 @@ snd_ad1889_capture_pointer(struct snd_pcm_substream *ss)if (snd_BUG_ON (ptr >= chip->ramc.size))return 0 ; - +return bytes_to_frames (ss->runtime, ptr); }
@@ -582,7 +582,7 @@ static struct snd_pcm_ops snd_ad1889_playback_ops = { .hw_free = snd_ad1889_hw_free, .prepare = snd_ad1889_playback_prepare, .trigger = snd_ad1889_playback_trigger, - .pointer = snd_ad1889_playback_pointer, + .pointer = snd_ad1889_playback_pointer, };static struct snd_pcm_ops snd_ad1889_capture_ops = {
@@ -593,7 +593,7 @@ static struct snd_pcm_ops snd_ad1889_capture_ops = { .hw_free = snd_ad1889_hw_free, .prepare = snd_ad1889_capture_prepare, .trigger = snd_ad1889_capture_trigger, - .pointer = snd_ad1889_capture_pointer, + .pointer = snd_ad1889_capture_pointer, }; static irqreturn_t
@@ -636,7 +636,7 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm)if (err <0 )return err; -snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , +snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_ad1889_playback_ops);snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &snd_ad1889_capture_ops);
@@ -644,7 +644,7 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm) pcm->private_data = chip; pcm->info_flags =0 ;strcpy (pcm->name, chip->card->shortname); - + chip->pcm = pcm; chip->psubs =NULL ; chip->csubs =NULL ;
@@ -658,10 +658,10 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device, struct snd_pcm **rpcm) snd_printk(KERN_ERR PFX "buffer allocation error: %d\n", err);return err; } - +if (rpcm) *rpcm = pcm; - +return 0 ; }
@@ -679,24 +679,24 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe (reg & AD_DS_WSMC_WAST) ? "stereo" : "mono");snd_iprintf (buffer,"Wave Quality: %d-bit linear\n" , (reg &AD_DS_WSMC_WA16 ) ?16 :8 ); - +/* WARQ is at offset 12 */ tmp = (reg &AD_DS_WSMC_WARQ ) ? (((reg &AD_DS_WSMC_WARQ >>12 ) &0x01 ) ?12 :18 ) :4 ; tmp /= (reg &AD_DS_WSMC_WAST ) ?2 :1 ; - +snd_iprintf (buffer,"Wave FIFO: %d %s words\n\n" , tmp, (reg &AD_DS_WSMC_WAST ) ?"stereo" :"mono" ); - - + +snd_iprintf (buffer,"Synthesis output: %s\n" , reg &AD_DS_WSMC_SYEN ?"enabled" :"disabled" ); - +/* SYRQ is at offset 4 */ tmp = (reg &AD_DS_WSMC_SYRQ ) ? (((reg &AD_DS_WSMC_SYRQ >>4 ) &0x01 ) ?12 :18 ) :4 ; tmp /= (reg &AD_DS_WSMC_WAST ) ?2 :1 ; - +snd_iprintf (buffer,"Synthesis FIFO: %d %s words\n\n" , tmp, (reg &AD_DS_WSMC_WAST ) ?"stereo" :"mono" );
@@ -707,27 +707,27 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffe (reg & AD_DS_RAMC_ADST) ? "stereo" : "mono");snd_iprintf (buffer,"ADC Quality: %d-bit linear\n" , (reg &AD_DS_RAMC_AD16 ) ?16 :8 ); - +/* ACRQ is at offset 4 */ tmp = (reg &AD_DS_RAMC_ACRQ ) ? (((reg &AD_DS_RAMC_ACRQ >>4 ) &0x01 ) ?12 :18 ) :4 ; tmp /= (reg &AD_DS_RAMC_ADST ) ?2 :1 ; - +snd_iprintf (buffer,"ADC FIFO: %d %s words\n\n" , tmp, (reg &AD_DS_RAMC_ADST ) ?"stereo" :"mono" ); - +snd_iprintf (buffer,"Resampler input: %s\n" , reg &AD_DS_RAMC_REEN ?"enabled" :"disabled" ); - +/* RERQ is at offset 12 */ tmp = (reg &AD_DS_RAMC_RERQ ) ? (((reg &AD_DS_RAMC_RERQ >>12 ) &0x01 ) ?12 :18 ) :4 ; tmp /= (reg &AD_DS_RAMC_ADST ) ?2 :1 ; - +snd_iprintf (buffer,"Resampler FIFO: %d %s words\n\n" , tmp, (reg &AD_DS_WSMC_WAST ) ?"stereo" :"mono" ); - - + +/* doc says LSB represents -1.5dB, but the max value (-94.5dB) suggests that LSB is -3dB, which is more coherent with the logarithmic nature of the dB scale */
@@ -739,7 +739,7 @@ snd_ad1889_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffesnd_iprintf (buffer,"Right: %s, -%d dB\n" , (reg &AD_DS_WADA_RWAM ) ?"mute" :"unmute" , ((reg &AD_DS_WADA_RWAA ) >>8 ) *3 ); - + reg =ad1889_readw (chip,AD_DS_WAS );snd_iprintf (buffer,"Wave samplerate: %u Hz\n" , reg); reg =ad1889_readw (chip,AD_DS_RES );
@@ -779,7 +779,7 @@ snd_ad1889_ac97_xinit(struct snd_ad1889 *chip)/* Interface Enable */ reg |=AD_AC97_ACIC_ACIE ;ad1889_writew (chip,AD_AC97_ACIC , reg); - +snd_ad1889_ac97_ready (chip);/* Audio Stream Output | Variable Sample Rate Mode */
@@ -820,7 +820,7 @@ snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override) err =snd_ac97_bus (chip->card,0 , &ops, chip, &chip->ac97_bus);if (err <0 )return err; - + chip->ac97_bus->private_free = snd_ad1889_ac97_bus_free;memset (&ac97,0 ,sizeof (ac97));
@@ -831,9 +831,9 @@ snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override) err =snd_ac97_mixer (chip->ac97_bus, &ac97, &chip->ac97);if (err <0 )return err; - +snd_ac97_tune_hardware (chip->ac97, ac97_quirks, quirk_override); - +return 0 ; }
@@ -871,14 +871,14 @@ skip_hw: }static int -snd_ad1889_dev_free (struct snd_device *device) +snd_ad1889_dev_free (struct snd_device *device) {struct snd_ad1889 *chip = device->device_data;return snd_ad1889_free (chip); }static int __devinit -snd_ad1889_init (struct snd_ad1889 *chip) +snd_ad1889_init (struct snd_ad1889 *chip) {ad1889_writew (chip,AD_DS_CCS ,AD_DS_CCS_CLKEN );/* turn on clock */ ad1889_readw (chip,AD_DS_CCS );/* flush posted write */
@@ -938,7 +938,7 @@ snd_ad1889_create(struct snd_card *card, err = -EBUSY ; goto free_and_ret; } - +pci_set_master (pci);spin_lock_init (&chip->lock);/* only now can we call ad1889_free */
@@ -1017,7 +1017,7 @@ snd_ad1889_probe(struct pci_dev *pci, err =snd_ad1889_ac97_init (chip, ac97_quirk[devno]);if (err <0 ) goto free_and_ret; - + err =snd_ad1889_pcm_init (chip,0 ,NULL );if (err <0 ) goto free_and_ret;
sound/pci/ak4531_codec.c +7 -7
@@ -43,13 +43,13 @@ static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak453/* * */ - +#if 0 static void snd_ak4531_dump (struct snd_ak4531 *ak4531) {int idx; - +for (idx =0 ; idx <0x19 ; idx++)printk ("ak4531 0x%x: 0x%x\n" , idx, ak4531->regs[idx]); }
@@ -84,7 +84,7 @@ static int snd_ak4531_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_ uinfo->value.integer.max = mask;return 0 ; } - +static int snd_ak4531_get_single (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ak4531 *ak4531 =snd_kcontrol_chip (kcontrol);
@@ -151,7 +151,7 @@ static int snd_ak4531_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_ uinfo->value.integer.max = mask;return 0 ; } - +static int snd_ak4531_get_double (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ak4531 *ak4531 =snd_kcontrol_chip (kcontrol);
@@ -226,7 +226,7 @@ static int snd_ak4531_info_input_sw(struct snd_kcontrol *kcontrol, struct snd_ct uinfo->value.integer.max =1 ;return 0 ; } - +static int snd_ak4531_get_input_sw (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ak4531 *ak4531 =snd_kcontrol_chip (kcontrol);
@@ -469,7 +469,7 @@ void snd_ak4531_resume(struct snd_ak4531 *ak4531)* /proc interface */ -static void snd_ak4531_proc_read (struct snd_info_entry *entry, +static void snd_ak4531_proc_read (struct snd_info_entry *entry,struct snd_info_buffer *buffer) {struct snd_ak4531 *ak4531 = entry->private_data;
@@ -486,7 +486,7 @@ snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531) {struct snd_info_entry *entry; -if (!snd_card_proc_new (card,"ak4531" , &entry)) +if (!snd_card_proc_new (card,"ak4531" , &entry))snd_info_set_text_ops (entry, ak4531, snd_ak4531_proc_read); }#endif
sound/pci/als300.c +8 -8
@@ -38,7 +38,7 @@#include <linux/interrupt.h> #include <linux/slab.h> -#include <asm/io.h> +#include <linux/io.h> #include <sound/core.h> #include <sound/control.h>
@@ -104,7 +104,7 @@ #define snd_als300_dbgplay(format, args...) printk(KERN_ERR format, ##args)#else #define snd_als300_dbgplay(format, args...) -#endif +#endif enum {DEVICE_ALS300 ,DEVICE_ALS300_PLUS };
@@ -136,7 +136,7 @@ struct snd_als300 {int chip_type;/* ALS300 or ALS300+ */ -char revision; +char revision; };struct snd_als300_substream_data {
@@ -239,7 +239,7 @@ static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id)u8 general, mpu, dram;struct snd_als300 *chip = dev_id;struct snd_als300_substream_data *data; - + general =inb (chip->port+ALS300P_IRQ_STATUS ); mpu =inb (chip->port+MPU_IRQ_STATUS ); dram =inb (chip->port+ALS300P_DRAM_IRQ_STATUS );
@@ -461,7 +461,7 @@ static int snd_als300_playback_prepare(struct snd_pcm_substream *substream)struct snd_pcm_runtime *runtime = substream->runtime;unsigned short period_bytes =snd_pcm_lib_period_bytes (substream);unsigned short buffer_bytes =snd_pcm_lib_buffer_bytes (substream); - +snd_als300_dbgcallenter ();spin_lock_irq (&chip->reg_lock); tmp =snd_als300_gcr_read (chip->port,PLAYBACK_CONTROL );
@@ -469,7 +469,7 @@ static int snd_als300_playback_prepare(struct snd_pcm_substream *substream)snd_als300_dbgplay ("Period bytes: %d Buffer bytes %d\n" , period_bytes, buffer_bytes); - +/* set block size */ tmp &=0xffff0000 ; tmp |= period_bytes -1 ;
@@ -571,7 +571,7 @@ static snd_pcm_uframes_t snd_als300_pointer(struct snd_pcm_substream *substream) data = substream->runtime->private_data; period_bytes =snd_pcm_lib_period_bytes (substream); - +snd_als300_dbgcallenter ();spin_lock (&chip->reg_lock); current_ptr = (u16) snd_als300_gcr_read(chip->port,
@@ -641,7 +641,7 @@ static void snd_als300_init(struct snd_als300 *chip) {unsigned long flags;u32 tmp; - +snd_als300_dbgcallenter ();spin_lock_irqsave (&chip->reg_lock, flags); chip->revision = (snd_als300_gcr_read (chip->port,MISC_CONTROL ) >>16 )
sound/pci/als4000.c +35 -35
223 lines not on this page · raw message
sound/pci/atiixp.c +32 -32
236 lines not on this page · raw message
sound/pci/atiixp_modem.c +23 -23
173 lines not on this page · raw message
sound/pci/aw2/aw2-alsa.c +1 -1
@@ -26,7 +26,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/delay.h> -#include <asm/io.h> +#include <linux/io.h> #include <sound/core.h> #include <sound/initval.h> #include <sound/pcm.h>
sound/pci/aw2/aw2-saa7146.c +1 -1
@@ -29,7 +29,7 @@#include <linux/interrupt.h> #include <linux/delay.h> #include <asm/system.h> -#include <asm/io.h> +#include <linux/io.h> #include <sound/core.h> #include <sound/initval.h> #include <sound/pcm.h>
sound/pci/azt3328.c +6 -6
@@ -159,7 +159,7 @@* - use MMIO (memory-mapped I/O)? Slightly faster access, e.g. for gameport. */ -#include <asm/io.h> +#include <linux/io.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/delay.h>
@@ -1360,7 +1360,7 @@ snd_azf3328_playback_pointer(struct snd_pcm_substream *substream)/* calculate offset */ result -= bufptr; - frmres =bytes_to_frames ( substream->runtime, result); + frmres =bytes_to_frames (substream->runtime, result);snd_azf3328_dbgplay ("PLAY @ 0x%8lx, frames %8ld\n" , result, frmres);return frmres; }
@@ -1381,7 +1381,7 @@ snd_azf3328_capture_pointer(struct snd_pcm_substream *substream)/* calculate offset */ result -= bufptr; - frmres =bytes_to_frames ( substream->runtime, result); + frmres =bytes_to_frames (substream->runtime, result);snd_azf3328_dbgplay ("REC @ 0x%8lx, frames %8ld\n" , result, frmres);return frmres; }
@@ -2063,14 +2063,14 @@ snd_azf3328_debug_show_ports(const struct snd_azf3328 *chip)snd_azf3328_game_inb (chip,5 ) ); -for (tmp =0 ; tmp <0x07 ; tmp +=1 ) +for (tmp =0 ; tmp <0x07 ; tmp++)snd_azf3328_dbgmisc ("mpu_io 0x%04x\n" ,inb (chip->mpu_io + tmp)); -for (tmp =0 ; tmp <=0x07 ; tmp +=1 ) +for (tmp =0 ; tmp <=0x07 ; tmp++)snd_azf3328_dbgmisc ("0x%02x: game200 0x%04x, game208 0x%04x\n" , tmp,inb (0x200 + tmp),inb (0x208 + tmp)); -for (tmp =0 ; tmp <=0x01 ; tmp +=1 ) +for (tmp =0 ; tmp <=0x01 ; tmp++) snd_azf3328_dbgmisc( "0x%02x: mpu300 0x%04x, mpu310 0x%04x, mpu320 0x%04x, " "mpu330 0x%04x opl388 0x%04x opl38c 0x%04x\n",
sound/pci/azt3328.h +3 -3
@@ -119,7 +119,7 @@ enum azf_freq_t {/* general */ #define IDX_IO_42H 0x42/* PU:0x0001 */ -/** DirectX timer, main interrupt area (FIXME: and something else?) **/ +/** DirectX timer, main interrupt area (FIXME: and something else?) **/ #define IDX_IO_TIMER_VALUE 0x60/* found this timer area by pure luck :-) */ /* timer countdown value; triggers IRQ when timer is finished */ #define TIMER_VALUE_MASK 0x000fffffUL
@@ -204,7 +204,7 @@ enum azf_freq_t {/*** Gameport area port indices ***/ -/* (only 0x06 of 0x08 bytes saved/restored by Windows driver) */ +/* (only 0x06 of 0x08 bytes saved/restored by Windows driver) */ #define AZF_IO_SIZE_GAME 0x08#define AZF_IO_SIZE_GAME_PM 0x06
@@ -333,7 +333,7 @@ enum {#define MIXER_ADVCTL2_MIX 0x0200/* Mono output select 0=Mix, 1=Mic; Win driver: "MonoSelectSource"?? */ #define MIXER_ADVCTL2_3D 0x2000/* 3D Enhancement 1=on */ #define MIXER_ADVCTL2_POP 0x8000/* Pcm Out Path, 0=pre 3D, 1=post 3D */ - +#define IDX_MIXER_SOMETHING30H 0x30/* used, but unknown??? */ /* driver internal flags */