From 31c58ddc43a3b6f96910bfef2965136d0ef6ceee Mon Sep 17 00:00:00 2001 From: neil Date: Thu, 31 Mar 2016 15:25:06 +0000 Subject: [PATCH] Fixed warnings in AHI code (Part 2). git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@52484 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/devs/AHI/Device/audioctrl.c | 2 +- workbench/devs/AHI/Drivers/CMI8738/cmi8738.c | 8 ---- workbench/devs/AHI/Drivers/Envy24/I2C.c | 11 +---- workbench/devs/AHI/Drivers/Envy24/Phase88.c | 4 +- workbench/devs/AHI/Drivers/Envy24/ak_codec.c | 6 +-- workbench/devs/AHI/Drivers/Envy24/interrupt.c | 15 +++---- workbench/devs/AHI/Drivers/Envy24/main.c | 50 ++++------------------ workbench/devs/AHI/Drivers/Envy24/misc.c | 16 +++---- workbench/devs/AHI/Drivers/Envy24/pci_wrapper.h | 6 +-- workbench/devs/AHI/Drivers/Envy24HT/Revo51.c | 2 - workbench/devs/AHI/Drivers/Envy24HT/ak_codec.c | 9 ++-- workbench/devs/AHI/Drivers/Envy24HT/interrupt.c | 9 ---- workbench/devs/AHI/Drivers/Envy24HT/main.c | 56 +++++++------------------ workbench/devs/AHI/Drivers/Envy24HT/misc.c | 28 ++----------- workbench/devs/AHI/Drivers/SB128/sb128.c | 8 ---- workbench/devs/AHI/Drivers/VIA-AC97/via.c | 9 ---- 16 files changed, 47 insertions(+), 192 deletions(-) diff --git a/workbench/devs/AHI/Device/audioctrl.c b/workbench/devs/AHI/Device/audioctrl.c index a3f1902ba4..65517ba128 100644 --- a/workbench/devs/AHI/Device/audioctrl.c +++ b/workbench/devs/AHI/Device/audioctrl.c @@ -205,7 +205,7 @@ CreateAudioCtrl(struct TagItem *tags) audioctrl->ac.ahiac_MixFreq = AHIBase->ahib_Frequency; if(audioctrl->ac.ahiac_PlayerFunc == NULL) - audioctrl->ac.ahiac_PlayerFunc=&DefPlayerHook; + audioctrl->ac.ahiac_PlayerFunc=(struct Hook *)&DefPlayerHook; if(audioctrl->ac.ahiac_PlayerFreq == 0) audioctrl->ac.ahiac_PlayerFreq = DEFPLAYERFREQ; diff --git a/workbench/devs/AHI/Drivers/CMI8738/cmi8738.c b/workbench/devs/AHI/Drivers/CMI8738/cmi8738.c index 96dbb293f4..8bd919a6b8 100755 --- a/workbench/devs/AHI/Drivers/CMI8738/cmi8738.c +++ b/workbench/devs/AHI/Drivers/CMI8738/cmi8738.c @@ -153,14 +153,6 @@ _AHIsub_AllocAudio( struct TagItem* taglist, card->playback_interrupt_enabled = FALSE; card->record_interrupt_enabled = FALSE; - - for( i = 1; i < FREQUENCIES; i++ ) - { - if( (ULONG) Frequencies[ i ] > AudioCtrl->ahiac_MixFreq ) - { - break; - } - } } ret = AHISF_KNOWHIFI | AHISF_KNOWSTEREO | AHISF_MIXING | AHISF_TIMING; diff --git a/workbench/devs/AHI/Drivers/Envy24/I2C.c b/workbench/devs/AHI/Drivers/Envy24/I2C.c index 9ef694fad5..9e1ba1cd7a 100644 --- a/workbench/devs/AHI/Drivers/Envy24/I2C.c +++ b/workbench/devs/AHI/Drivers/Envy24/I2C.c @@ -1,5 +1,5 @@ /* - Copyright � 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2004-2014, Davy Wentzler. All rights reserved. $Id$ */ @@ -83,15 +83,6 @@ static void I2C_bit_set(struct CardData *card, int clock, int data) } -static int I2C_bit_clock(struct CardData *card) -{ - if (card->bit_ops->GetClock) - return card->bit_ops->GetClock(card); - - return 0; -} - - static int I2C_bit_data(struct CardData *card, int ack) { return card->bit_ops->GetData(card, ack); diff --git a/workbench/devs/AHI/Drivers/Envy24/Phase88.c b/workbench/devs/AHI/Drivers/Envy24/Phase88.c index 6a8535075e..01962b2c27 100644 --- a/workbench/devs/AHI/Drivers/Envy24/Phase88.c +++ b/workbench/devs/AHI/Drivers/Envy24/Phase88.c @@ -1,5 +1,5 @@ /* - Copyright � 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2004-2014, Davy Wentzler. All rights reserved. $Id$ */ @@ -17,8 +17,6 @@ static void Phase88_Start(struct CardData *card) { - unsigned char mask; - SaveGPIOStatus(card); WriteCCI(card, CCI_GPIO_DIR, card->gpio_dir | PHASE88_RW); // prepare for write diff --git a/workbench/devs/AHI/Drivers/Envy24/ak_codec.c b/workbench/devs/AHI/Drivers/Envy24/ak_codec.c index 95030625ec..90dee33754 100644 --- a/workbench/devs/AHI/Drivers/Envy24/ak_codec.c +++ b/workbench/devs/AHI/Drivers/Envy24/ak_codec.c @@ -1,5 +1,5 @@ /* - Copyright � 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2004-2014, Davy Wentzler. All rights reserved. $Id$ */ @@ -28,8 +28,6 @@ void akm4xxx_write(struct CardData *card, struct akm_codec *priv, int chip, unsi unsigned int tmp; int idx; unsigned int addrdata = 0; - struct PCIDevice *dev = card->pci_dev; - unsigned long base = card->iobase; tmp = snd_ice1712_gpio_read(ice); tmp |= priv->add_flags; @@ -92,8 +90,6 @@ void akm4xxx_write_old(struct CardData *card, struct akm_codec *codec, int chip, unsigned char tmp; int idx; unsigned int addrdata = 0; - struct PCIDevice *dev = card->pci_dev; - unsigned long base = card->iobase; //IExec->DebugPrintF("m = %x, %x, data = %x\n", dev->InByte(base + 0x1F), dev->InWord(base + 0x16), data); diff --git a/workbench/devs/AHI/Drivers/Envy24/interrupt.c b/workbench/devs/AHI/Drivers/Envy24/interrupt.c index 717487ae91..de26c55b53 100644 --- a/workbench/devs/AHI/Drivers/Envy24/interrupt.c +++ b/workbench/devs/AHI/Drivers/Envy24/interrupt.c @@ -1,5 +1,6 @@ /* - Copyright � 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2014-2016, The AROS Development Team. All rights reserved. $Id$ */ @@ -28,7 +29,6 @@ AROS_INTH1(CardInterrupt, struct CardData *, card) AROS_INTFUNC_INIT struct AHIAudioCtrlDrv* AudioCtrl = card->audioctrl; - struct DriverBase* AHIsubBase = (struct DriverBase*) card->ahisubbase; unsigned char intreq; LONG handled = 0; @@ -131,9 +131,6 @@ AROS_INTH1(PlaybackInterrupt, struct CardData *, card) BOOL skip_mix; WORD* src; - WORD* dst; - size_t skip; - size_t samples; int i; LONG *srclong, *dstlong, left, right; int frames = card->current_frames; @@ -150,11 +147,7 @@ AROS_INTH1(PlaybackInterrupt, struct CardData *, card) /* Now translate and transfer to the DMA buffer */ - skip = ( AudioCtrl->ahiac_Flags & AHIACF_HIFI ) ? 2 : 1; - samples = card->current_bytesize >> 1; - src = card->mix_buffer; - dst = card->current_buffer; srclong = (LONG*) card->mix_buffer; dstlong = (LONG*) card->current_buffer; @@ -200,6 +193,8 @@ AROS_INTH1(PlaybackInterrupt, struct CardData *, card) card->playback_interrupt_enabled = TRUE; + return FALSE; + AROS_INTFUNC_EXIT } @@ -280,6 +275,8 @@ AROS_INTH1(RecordInterrupt, struct CardData *, card) card->record_interrupt_enabled = TRUE; + return FALSE; + AROS_INTFUNC_EXIT } diff --git a/workbench/devs/AHI/Drivers/Envy24/main.c b/workbench/devs/AHI/Drivers/Envy24/main.c index 0595c4d41c..b7574ea7f6 100644 --- a/workbench/devs/AHI/Drivers/Envy24/main.c +++ b/workbench/devs/AHI/Drivers/Envy24/main.c @@ -1,5 +1,5 @@ /* - Copyright � 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2004-2014, Davy Wentzler. All rights reserved. $Id$ */ @@ -83,7 +83,7 @@ static const STRPTR Inputs[ INPUTS ] = "Line 3 - 4", "Line 5 - 6", "Line 7 - 8", - "S/PDIF", +// "S/PDIF", }; @@ -103,7 +103,7 @@ static const STRPTR Outputs[ OUTPUTS ] = "Line 3 - 4", "Line 5 - 6", "Line 7 - 8", - "S/PDIF", +// "S/PDIF", }; #define OUTPUTS_2496 1 @@ -137,7 +137,7 @@ static const STRPTR Inputs_Delta66[ INPUTS_DELTA66 ] = { "Line 1 - 2", "Line 3 - 4", - "S/PDIF" +// "S/PDIF" }; #define OUTPUTS_DELTA66 1 @@ -161,7 +161,7 @@ _AHIsub_AllocAudio( struct TagItem* taglist, int card_num; ULONG ret; - int i, freq = 9; + int i; card_num = ( GetTagData( AHIDB_AudioID, 0, taglist) & 0x0000f000 ) >> 12; @@ -176,7 +176,6 @@ _AHIsub_AllocAudio( struct TagItem* taglist, { struct CardData* card; BOOL in_use; - struct PCIDevice *dev; card = CardBase->driverdatas[ card_num ]; AudioCtrl->ahiac_DriverData = card; @@ -194,27 +193,8 @@ _AHIsub_AllocAudio( struct TagItem* taglist, return AHISF_ERROR; } - dev = card->pci_dev; card->playback_interrupt_enabled = FALSE; card->record_interrupt_enabled = FALSE; - - for( i = 1; i < FREQUENCIES; i++ ) - { - if( (ULONG) Frequencies[ i ] > AudioCtrl->ahiac_MixFreq ) - { - if ( ( AudioCtrl->ahiac_MixFreq - (LONG) Frequencies[ i - 1 ] ) < ( (LONG) Frequencies[ i ] - AudioCtrl->ahiac_MixFreq ) ) - { - freq = i-1; - break; - } - else - { - freq = i; - break; - } - } - } - } ret = AHISF_KNOWHIFI | AHISF_KNOWSTEREO | AHISF_MIXING | AHISF_TIMING; @@ -268,8 +248,6 @@ void _AHIsub_Disable( struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; - // V6 drivers do not have to preserve all registers Disable(); @@ -284,8 +262,6 @@ void _AHIsub_Enable( struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; - // V6 drivers do not have to preserve all registers Enable(); @@ -301,7 +277,6 @@ _AHIsub_Update( ULONG flags, struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; struct CardData* card = (struct CardData*) AudioCtrl->ahiac_DriverData; card->current_frames = AudioCtrl->ahiac_BuffSamples; @@ -326,13 +301,9 @@ _AHIsub_Start( ULONG flags, struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; struct CardData* card = (struct CardData*) AudioCtrl->ahiac_DriverData; - struct PCIDevice *dev = card->pci_dev; - UWORD PlayCtrlFlags = 0, RecCtrlFlags = 0; ULONG dma_buffer_size = 0; int i, freqbit = 9; - APTR stack; /* Stop playback/recording, free old buffers (if any) */ //IAHIsub->AHIsub_Stop( flags, AudioCtrl ); @@ -350,9 +321,6 @@ _AHIsub_Start( ULONG flags, { ULONG dma_sample_frame_size; - int i; - short *a; - unsigned short cod, ChannelsFlag = 0; /* Update cached/syncronized variables */ @@ -492,9 +460,7 @@ _AHIsub_Stop( ULONG flags, struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; struct CardData* card = (struct CardData*) AudioCtrl->ahiac_DriverData; - struct PCIDevice *dev = card->pci_dev; if( (flags & AHISF_PLAY) && card->is_playing == TRUE) { @@ -521,8 +487,6 @@ _AHIsub_Stop( ULONG flags, if( (flags & AHISF_RECORD) && card->is_recording == TRUE) { - unsigned short rec_ctl, val; - card->is_recording = FALSE; //DebugPrintF("STOPPING REC\n"); @@ -727,9 +691,9 @@ _AHIsub_HardwareControl( ULONG attribute, struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; - struct CardData* card = (struct CardData*) AudioCtrl->ahiac_DriverData; #if 0 + struct CardData* card = (struct CardData*) AudioCtrl->ahiac_DriverData; + switch( attribute ) { case AHIC_MonitorVolume: diff --git a/workbench/devs/AHI/Drivers/Envy24/misc.c b/workbench/devs/AHI/Drivers/Envy24/misc.c index 9fdd4f8f86..4fbf0ac872 100644 --- a/workbench/devs/AHI/Drivers/Envy24/misc.c +++ b/workbench/devs/AHI/Drivers/Envy24/misc.c @@ -1,5 +1,5 @@ /* - Copyright � 2004-2014, Davy Wentzler. All rights reserved. + Copyright © 2004-2014, Davy Wentzler. All rights reserved. $Id$ */ @@ -167,10 +167,8 @@ struct CardData* AllocDriverData( struct PCIDevice * dev, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; struct CardData* card; UWORD command_word; - int i; card = AllocVec( sizeof( *card ), MEMF_PUBLIC | MEMF_CLEAR ); @@ -191,13 +189,13 @@ AllocDriverData( struct PCIDevice * dev, card->playback_interrupt.is_Node.ln_Type = NT_EXTINTERRUPT; card->playback_interrupt.is_Node.ln_Pri = 0; card->playback_interrupt.is_Node.ln_Name = (STRPTR) LibName; - card->playback_interrupt.is_Code = PlaybackInterrupt; + card->playback_interrupt.is_Code = (APTR) PlaybackInterrupt; card->playback_interrupt.is_Data = (APTR) card; card->record_interrupt.is_Node.ln_Type = NT_EXTINTERRUPT; card->record_interrupt.is_Node.ln_Pri = 0; card->record_interrupt.is_Node.ln_Name = (STRPTR) LibName; - card->record_interrupt.is_Code = RecordInterrupt; + card->record_interrupt.is_Code = (APTR) RecordInterrupt; card->record_interrupt.is_Data = (APTR) card; card->pci_dev = dev; @@ -288,10 +286,8 @@ FreeDriverData( struct CardData* card, int card_init(struct CardData *card, struct DriverBase* AHIsubBase) { struct PCIDevice *dev = (struct PCIDevice *) card->pci_dev; - unsigned short cod; int i; - unsigned int tmp; - unsigned char b, eeprom[128]; + unsigned char eeprom[128]; pci_outb(CCI_PRO_POWER_DOWN, CCS_ENVY_INDEX, card); pci_outb(0xFF, CCS_ENVY_DATA, card); @@ -314,7 +310,7 @@ int card_init(struct CardData *card, struct DriverBase* AHIsubBase) if (pci_inb(CCS_I2C_STATUS, card) & 0x80) { - int version, size; + int size; unsigned long subvendor = 0; for (i = 0; i < 4; i++) @@ -353,7 +349,7 @@ int card_init(struct CardData *card, struct DriverBase* AHIsubBase) } size = read_i2c(dev, card, 4); - version = read_i2c(dev, card, 5); +// read_i2c(dev, card, 5); //DebugPrintF("EEPROM size = %ld, version = %ld\n", size, version); size -= 6; // including bytes 0 - 5 diff --git a/workbench/devs/AHI/Drivers/Envy24/pci_wrapper.h b/workbench/devs/AHI/Drivers/Envy24/pci_wrapper.h index b7f054495a..802a89d88a 100644 --- a/workbench/devs/AHI/Drivers/Envy24/pci_wrapper.h +++ b/workbench/devs/AHI/Drivers/Envy24/pci_wrapper.h @@ -1,5 +1,5 @@ /* - Copyright © 2004-2014, The AROS Development Team. All rights reserved. + Copyright © 2004-2016, The AROS Development Team. All rights reserved. $Id$ */ @@ -179,11 +179,7 @@ ULONG ahi_pci_mem_map(APTR addr, APTR dev); #ifdef __AROS__ #include -#if DEBUG #define DebugPrintF bug -#else -#define DebugPrintF -#endif #define NT_EXTINTERRUPT NT_INTERRUPT #endif diff --git a/workbench/devs/AHI/Drivers/Envy24HT/Revo51.c b/workbench/devs/AHI/Drivers/Envy24HT/Revo51.c index ee2c88f532..4795918766 100644 --- a/workbench/devs/AHI/Drivers/Envy24HT/Revo51.c +++ b/workbench/devs/AHI/Drivers/Envy24HT/Revo51.c @@ -14,8 +14,6 @@ static void Revo51_Start(struct CardData *card) { - unsigned char mask; - SaveGPIO(card->pci_dev, card); } diff --git a/workbench/devs/AHI/Drivers/Envy24HT/ak_codec.c b/workbench/devs/AHI/Drivers/Envy24HT/ak_codec.c index 62612b41da..f0d09187c7 100644 --- a/workbench/devs/AHI/Drivers/Envy24HT/ak_codec.c +++ b/workbench/devs/AHI/Drivers/Envy24HT/ak_codec.c @@ -23,7 +23,6 @@ void akm4xxx_write(struct CardData *card, struct akm_codec *codec, int chip, uns unsigned int tmp; int idx; unsigned int addrdata = 0; - struct PCIDevice *dev = card->pci_dev; unsigned long base = card->iobase; if (codec->newflag) @@ -100,7 +99,6 @@ void akm4xxx_write_new(struct CardData *card, struct akm_codec *priv, int chip, unsigned int tmp; int idx; unsigned int addrdata = 0; - struct PCIDevice *dev = card->pci_dev; unsigned long base = card->iobase; //DEBUGPRINTF("AKM: %x, %x\n", addr, data); @@ -318,7 +316,10 @@ void Init_akm4xxx(struct CardData *card, struct akm_codec *codec) return; } - //for (chip = 0; chip < num_chips; chip++) { +#if 1 +num_chips = 1; +#endif + for (chip = 0; chip < num_chips; chip++) { ptr = inits; while (*ptr != 0xff) { reg = *ptr++; @@ -326,7 +327,7 @@ void Init_akm4xxx(struct CardData *card, struct akm_codec *codec) akm4xxx_write(card, codec, 0, reg, data); MicroDelay(5); } - //} + } } #define AK_GET_CHIP(val) (((val) >> 8) & 0xff) diff --git a/workbench/devs/AHI/Drivers/Envy24HT/interrupt.c b/workbench/devs/AHI/Drivers/Envy24HT/interrupt.c index 91268dd2d5..14ffd455b9 100644 --- a/workbench/devs/AHI/Drivers/Envy24HT/interrupt.c +++ b/workbench/devs/AHI/Drivers/Envy24HT/interrupt.c @@ -39,8 +39,6 @@ CardInterrupt( struct CardData* card ) #endif { struct AHIAudioCtrlDrv* AudioCtrl = card->audioctrl; - struct DriverBase* AHIsubBase = (struct DriverBase*) card->ahisubbase; - struct PCIDevice *dev = (struct PCIDevice * ) card->pci_dev; unsigned char intreq; LONG handled = 0; @@ -148,15 +146,12 @@ PlaybackInterrupt( struct CardData* card ) #endif { struct AHIAudioCtrlDrv* AudioCtrl = card->audioctrl; - struct DriverBase* AHIsubBase = (struct DriverBase*) card->ahisubbase; if( card->mix_buffer != NULL && card->current_buffer != NULL && card->is_playing) { BOOL skip_mix; WORD* src; - size_t skip; - size_t samples; int i; LONG* srclong, *dstlong, *spdif_dstlong, left, right; int frames = card->current_frames; @@ -173,9 +168,6 @@ PlaybackInterrupt( struct CardData* card ) /* Now translate and transfer to the DMA buffer */ - skip = ( AudioCtrl->ahiac_Flags & AHIACF_HIFI ) ? 2 : 1; - samples = card->current_bytesize >> 1; - src = card->mix_buffer; srclong = (LONG*) card->mix_buffer; @@ -271,7 +263,6 @@ RecordInterrupt( struct CardData* card ) #endif { struct AHIAudioCtrlDrv* AudioCtrl = card->audioctrl; - struct DriverBase* AHIsubBase = (struct DriverBase*) card->ahisubbase; int i = 0, frames = card->current_record_bytesize_32bit / 4; if (card->input_is_24bits) diff --git a/workbench/devs/AHI/Drivers/Envy24HT/main.c b/workbench/devs/AHI/Drivers/Envy24HT/main.c index 3c097f0bec..b73d64e5a3 100644 --- a/workbench/devs/AHI/Drivers/Envy24HT/main.c +++ b/workbench/devs/AHI/Drivers/Envy24HT/main.c @@ -179,7 +179,7 @@ _AHIsub_AllocAudio( struct TagItem* taglist, int card_num; ULONG ret; - int i, freq = 9; + int i; card_num = ( GETTAGDATA( AHIDB_AudioID, 0, taglist) & 0x0000f000 ) >> 12; @@ -194,7 +194,6 @@ _AHIsub_AllocAudio( struct TagItem* taglist, { struct CardData* card; BOOL in_use; - struct PCIDevice *dev; card = CardBase->driverdatas[ card_num ]; AudioCtrl->ahiac_DriverData = card; @@ -212,27 +211,8 @@ _AHIsub_AllocAudio( struct TagItem* taglist, return AHISF_ERROR; } - dev = card->pci_dev; card->playback_interrupt_enabled = FALSE; card->record_interrupt_enabled = FALSE; - - for( i = 1; i < FREQUENCIES; i++ ) - { - if( (ULONG) Frequencies[ i ] > AudioCtrl->ahiac_MixFreq ) - { - if ( ( AudioCtrl->ahiac_MixFreq - (LONG) Frequencies[ i - 1 ] ) < ( (LONG) Frequencies[ i ] - AudioCtrl->ahiac_MixFreq ) ) - { - freq = i-1; - break; - } - else - { - freq = i; - break; - } - } - } - } ret = AHISF_KNOWHIFI | AHISF_KNOWSTEREO | AHISF_MIXING | AHISF_TIMING; @@ -286,8 +266,6 @@ void _AHIsub_Disable( struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; - // V6 drivers do not have to preserve all registers #ifdef __amigaos4__ @@ -306,8 +284,6 @@ void _AHIsub_Enable( struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; - // V6 drivers do not have to preserve all registers #ifdef __amigaos4__ @@ -328,16 +304,14 @@ _AHIsub_Start( ULONG flags, struct AHIAudioCtrlDrv* AudioCtrl, struct DriverBase* AHIsubBase ) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; struct CardData* card = (struct CardData*) AudioCtrl->ahiac_DriverData; - struct PCIDevice *dev = card->pci_dev; - UWORD PlayCtrlFlags = 0, RecCtrlFlags = 0; ULONG dma_buffer_size = 0; - int i, freqbit = 9, SPDIF_freqbit = -1; + int i, freqbit = 9; BOOL SPDIF = FALSE; unsigned char RMASK = MT_RDMA0_MASK; +#ifdef __amigaos4__ APTR stack; - +#endif /* Stop playback/recording, free old buffers (if any) */ //IAHIsub->AHIsub_Stop( flags, AudioCtrl ); @@ -355,7 +329,6 @@ _AHIsub_Start( ULONG flags, { if( AudioCtrl->ahiac_MixFreq == SPDIF_Frequencies[ i ] ) { - SPDIF_freqbit = i; SPDIF = TRUE; break; } @@ -369,10 +342,6 @@ _AHIsub_Start( ULONG flags, { ULONG dma_sample_frame_size; - int i; - short *a; - unsigned short cod, ChannelsFlag = 0; - /* Allocate a new mixing buffer. Note: The buffer must be cleared, since it might not be filled by the mixer software interrupt because of @@ -425,14 +394,17 @@ _AHIsub_Start( ULONG flags, card->spdif_out_buffer_phys = IMMU->GetPhysicalAddress(card->spdif_out_buffer); IExec->UserState(stack); #elif __MORPHOS__ - card->playback_buffer_phys = ahi_pci_logic_to_physic_addr(card->playback_buffer, dev); - card->spdif_out_buffer_phys = ahi_pci_logic_to_physic_addr(card->spdif_out_buffer, dev); + card->playback_buffer_phys = + ahi_pci_logic_to_physic_addr(card->playback_buffer, card->pci_dev); + card->spdif_out_buffer_phys = + ahi_pci_logic_to_physic_addr(card->spdif_out_buffer, card->pci_dev); #else card->playback_buffer_phys = card->playback_buffer; card->spdif_out_buffer_phys = card->spdif_out_buffer; // if SPDIF were false, this pointer wouldn't get initialized, which might mean trouble in the IRQ #endif - OUTLONG(card->mtbase + MT_DMAI_PB_ADDRESS, card->playback_buffer_phys); + OUTLONG(card->mtbase + MT_DMAI_PB_ADDRESS, + (ULONG)card->playback_buffer_phys); //kprintf("card->playback_buffer_phys = %lx, virt = %lx\n", card->playback_buffer_phys, card->playback_buffer); //DEBUGPRINTF("addr = %lx, %lx\n", card->playback_buffer_phys, INLONG(card->mtbase + MT_DMAI_PB_ADDRESS)); @@ -453,7 +425,8 @@ _AHIsub_Start( ULONG flags, WriteMask8(card, card->iobase, CCS_SPDIF_CONFIG, CCS_SPDIF_INTEGRATED); // enable - OUTLONG(card->mtbase + MT_PDMA4_ADDRESS, card->spdif_out_buffer_phys); + OUTLONG(card->mtbase + MT_PDMA4_ADDRESS, + (ULONG)card->spdif_out_buffer_phys); OUTWORD(card->mtbase + MT_PDMA4_LENGTH, (dma_buffer_size ) / 4 - 1); OUTWORD(card->mtbase + MT_PDMA4_INTLEN, (dma_buffer_size / 2) / 4 - 1); @@ -506,7 +479,8 @@ _AHIsub_Start( ULONG flags, card->record_buffer_32bit_phys = IMMU->GetPhysicalAddress(card->record_buffer_32bit); IExec->UserState(stack); #elif __MORPHOS__ - card->record_buffer_32bit_phys = ahi_pci_logic_to_physic_addr(card->record_buffer_32bit, dev); + card->record_buffer_32bit_phys = + ahi_pci_logic_to_physic_addr(card->record_buffer_32bit, card->pci_dev); #else card->record_buffer_32bit_phys = card->record_buffer_32bit; #endif @@ -538,7 +512,7 @@ _AHIsub_Start( ULONG flags, if( flags & AHISF_PLAY ) { unsigned char start = MT_PDMA0_START; - int i; + /*int i;*/ if (SPDIF) { diff --git a/workbench/devs/AHI/Drivers/Envy24HT/misc.c b/workbench/devs/AHI/Drivers/Envy24HT/misc.c index 7425312b0f..19672069d4 100644 --- a/workbench/devs/AHI/Drivers/Envy24HT/misc.c +++ b/workbench/devs/AHI/Drivers/Envy24HT/misc.c @@ -75,8 +75,6 @@ static unsigned char inits_ak4358[] = { void revo_i2s_mclk_changed(struct CardData *card) { - struct PCIDevice *dev = card->pci_dev; - /* assert PRST# to converters; MT05 bit 7 */ OUTBYTE(card->mtbase + MT_AC97_CMD_STATUS, INBYTE(card->mtbase + MT_AC97_CMD_STATUS) | 0x80); MicroDelay(5); @@ -224,7 +222,6 @@ void WriteI2C(struct PCIDevice *dev, struct CardData *card, unsigned chip_addres void update_spdif_bits(struct CardData *card, unsigned short val) { unsigned char cbit, disabled; - struct PCIDevice *dev = card->pci_dev; cbit = INBYTE(card->iobase + CCS_SPDIF_CONFIG); // get S/PDIF status disabled = cbit & ~CCS_SPDIF_INTEGRATED; // status without enabled bit set @@ -244,8 +241,6 @@ void update_spdif_bits(struct CardData *card, unsigned short val) void update_spdif_rate(struct CardData *card, unsigned short rate) { unsigned short val, nval; - unsigned long flags; - struct PCIDevice *dev = card->pci_dev; nval = val = INWORD(card->mtbase + MT_SPDIF_TRANSMIT); nval &= ~(7 << 12); @@ -261,7 +256,6 @@ void update_spdif_rate(struct CardData *card, unsigned short rate) static void aureon_spi_write(struct CardData *card, unsigned long base, unsigned int cs, unsigned int data, int bits) { - struct PCIDevice *dev = card->pci_dev; unsigned int tmp; int i; @@ -404,16 +398,6 @@ int aureon_ac97_init(struct CardData *card, unsigned long base) -/* - * get the current register value of WM codec - */ -static unsigned short wm_get(struct PCIDevice *dev, unsigned long base, int reg) -{ -// reg <<= 1; -// return ((unsigned short)ice->akm[0].images[reg] << 8) | ice->akm[0].images[reg + 1]; -return 0; -} - void wm_put(struct CardData *card, unsigned long base, unsigned short reg, unsigned short val) { aureon_spi_write(card, base, AUREON_WM_CS, (reg << 9) | (val & 0x1ff), 16); @@ -496,10 +480,8 @@ INTGW( static, ULONG, cardinterrupt, CardInterrupt ); struct CardData* AllocDriverData(struct PCIDevice *dev, struct DriverBase* AHIsubBase) { - struct CardBase* CardBase = (struct CardBase*) AHIsubBase; struct CardData* card; UWORD command_word; - int i; card = ALLOCVEC( sizeof( *card ), MEMF_PUBLIC | MEMF_CLEAR ); @@ -551,8 +533,8 @@ struct CardData* AllocDriverData(struct PCIDevice *dev, struct DriverBase* AHIsu card->pci_master_enabled = TRUE; - card->iobase = ahi_pci_get_base_address(0, dev); - card->mtbase = ahi_pci_get_base_address(1, dev); + card->iobase = (unsigned long)ahi_pci_get_base_address(0, dev); + card->mtbase = (unsigned long)ahi_pci_get_base_address(1, dev); card->irq = ahi_pci_get_irq(dev); card->chiprev = READCONFIGBYTE( PCI_REVISION_ID); card->model = READCONFIGWORD( PCI_SUBSYSTEM_ID); @@ -734,10 +716,8 @@ static unsigned short wm_inits_Phase28[] = { int card_init(struct CardData *card) { struct PCIDevice *dev = (struct PCIDevice *) card->pci_dev; - unsigned short cod; int i; - unsigned int tmp, eepromsize; - unsigned char eeprom[128]; + unsigned int tmp; OUTBYTE(card->mtbase + MT_AC97_CMD_STATUS, MT_AC97_RESET); // tbd MicroDelay(5); @@ -1045,8 +1025,6 @@ int card_init(struct CardData *card) } else if (card->SubType == PHASE22) { - unsigned int tmp; - card->RevoFrontCodec = ALLOCVEC(sizeof(struct akm_codec), MEMF_ANY); card->RevoFrontCodec->caddr = 2; card->RevoFrontCodec->csmask = 1 << 10; diff --git a/workbench/devs/AHI/Drivers/SB128/sb128.c b/workbench/devs/AHI/Drivers/SB128/sb128.c index fec1ff6045..e19061f983 100755 --- a/workbench/devs/AHI/Drivers/SB128/sb128.c +++ b/workbench/devs/AHI/Drivers/SB128/sb128.c @@ -146,14 +146,6 @@ _AHIsub_AllocAudio( struct TagItem* taglist, card->record_interrupt_enabled = FALSE; /* Clears playback/record interrupts */ pci_outl((pci_inl(SB128_SCON, card)) & SB128_IRQ_MASK, SB128_SCON, card); - - for( i = 1; i < FREQUENCIES; i++ ) - { - if( (ULONG) Frequencies[ i ] > AudioCtrl->ahiac_MixFreq ) - { - break; - } - } } ret = AHISF_KNOWHIFI | AHISF_KNOWSTEREO | AHISF_MIXING | AHISF_TIMING; diff --git a/workbench/devs/AHI/Drivers/VIA-AC97/via.c b/workbench/devs/AHI/Drivers/VIA-AC97/via.c index bfbe0b6de7..c1f9745169 100644 --- a/workbench/devs/AHI/Drivers/VIA-AC97/via.c +++ b/workbench/devs/AHI/Drivers/VIA-AC97/via.c @@ -398,15 +398,6 @@ _AHIsub_AllocAudio( struct TagItem* taglist, card->playback_interrupt_enabled = FALSE; card->record_interrupt_enabled = FALSE; - - for( i = 1; i < FREQUENCIES; i++ ) - { - if( (ULONG) Frequencies[ i ] > AudioCtrl->ahiac_MixFreq ) - { - break; - } - } - } ret = AHISF_KNOWHIFI | AHISF_KNOWSTEREO | AHISF_MIXING | AHISF_TIMING; -- 2.11.4.GIT