sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some flawed defensive programming in audio drivers.

Browse source
This commit is contained in:
Kees van Reeuwijk 2010-01-18 21:37:24 +00:00
parent 32ad26e698
commit 3a892d2312
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/audio/es1370/es1370.c
View file

@ -353,11 +353,11 @@ int drv_set_dma(u32_t dma, u32_t length, int chan) {
case DAC1_CHAN: page = DAC_MEM_PAGE; case DAC1_CHAN: page = DAC_MEM_PAGE;
frame_count_reg = DAC1_BUFFER_SIZE; frame_count_reg = DAC1_BUFFER_SIZE;
dma_add_reg = DAC1_PCI_ADDRESS; dma_add_reg = DAC1_PCI_ADDRESS;
break;; break;
case DAC2_CHAN: page = DAC_MEM_PAGE; case DAC2_CHAN: page = DAC_MEM_PAGE;
frame_count_reg = DAC2_BUFFER_SIZE; frame_count_reg = DAC2_BUFFER_SIZE;
dma_add_reg = DAC2_PCI_ADDRESS; dma_add_reg = DAC2_PCI_ADDRESS;
break;; break;
default: return EIO; default: return EIO;
} }
pci_outb(reg(MEM_PAGE), page); pci_outb(reg(MEM_PAGE), page);
@ -390,9 +390,10 @@ int drv_int(int sub_dev) {
/* return status of interrupt bit of specified channel*/ /* return status of interrupt bit of specified channel*/
switch (sub_dev) { switch (sub_dev) {
case DAC1_CHAN: bit = DAC1;break; case DAC1_CHAN: bit = DAC1; break;
case DAC2_CHAN: bit = DAC2;break; case DAC2_CHAN: bit = DAC2; break;
case ADC1_CHAN: bit = ADC;break; case ADC1_CHAN: bit = ADC; break;
default: return EINVAL;
} }
int_status = pci_inl(reg(INTERRUPT_STATUS)) & bit; int_status = pci_inl(reg(INTERRUPT_STATUS)) & bit;
@ -408,7 +409,7 @@ int drv_reenable_int(int chan) {
case ADC1_CHAN: int_en_bit = R1_INT_EN; break; case ADC1_CHAN: int_en_bit = R1_INT_EN; break;
case DAC1_CHAN: int_en_bit = P1_INTR_EN; break; case DAC1_CHAN: int_en_bit = P1_INTR_EN; break;
case DAC2_CHAN: int_en_bit = P2_INTR_EN; break; case DAC2_CHAN: int_en_bit = P2_INTR_EN; break;
default: EINVAL; default: return EINVAL;
} }
/* clear and reenable an interrupt */ /* clear and reenable an interrupt */
@ -591,7 +592,7 @@ PRIVATE int disable_int(int chan) {
case ADC1_CHAN: int_en_bit = R1_INT_EN; break; case ADC1_CHAN: int_en_bit = R1_INT_EN; break;
case DAC1_CHAN: int_en_bit = P1_INTR_EN; break; case DAC1_CHAN: int_en_bit = P1_INTR_EN; break;
case DAC2_CHAN: int_en_bit = P2_INTR_EN; break; case DAC2_CHAN: int_en_bit = P2_INTR_EN; break;
default: EINVAL; default: return EINVAL;
} }
/* clear the interrupt */ /* clear the interrupt */
ser_interface = pci_inw(reg(SERIAL_INTERFACE_CTRL)); ser_interface = pci_inw(reg(SERIAL_INTERFACE_CTRL));

5
drivers/audio/es1371/es1371.c
View file

@ -395,6 +395,7 @@ int drv_int(int sub_dev) {
case DAC1_CHAN: bit = DAC1;break; case DAC1_CHAN: bit = DAC1;break;
case DAC2_CHAN: bit = DAC2;break; case DAC2_CHAN: bit = DAC2;break;
case ADC1_CHAN: bit = ADC;break; case ADC1_CHAN: bit = ADC;break;
default: return EINVAL;
} }
int_status = pci_inl(reg(INTERRUPT_STATUS)) & bit; int_status = pci_inl(reg(INTERRUPT_STATUS)) & bit;
@ -410,7 +411,7 @@ int drv_reenable_int(int chan) {
case ADC1_CHAN: int_en_bit = R1_INT_EN; break; case ADC1_CHAN: int_en_bit = R1_INT_EN; break;
case DAC1_CHAN: int_en_bit = P1_INTR_EN; break; case DAC1_CHAN: int_en_bit = P1_INTR_EN; break;
case DAC2_CHAN: int_en_bit = P2_INTR_EN; break; case DAC2_CHAN: int_en_bit = P2_INTR_EN; break;
default: EINVAL; default: return EINVAL;
} }
/* clear and reenable an interrupt */ /* clear and reenable an interrupt */
@ -594,7 +595,7 @@ PRIVATE int disable_int(int chan) {
case ADC1_CHAN: int_en_bit = R1_INT_EN; break; case ADC1_CHAN: int_en_bit = R1_INT_EN; break;
case DAC1_CHAN: int_en_bit = P1_INTR_EN; break; case DAC1_CHAN: int_en_bit = P1_INTR_EN; break;
case DAC2_CHAN: int_en_bit = P2_INTR_EN; break; case DAC2_CHAN: int_en_bit = P2_INTR_EN; break;
default: EINVAL; default: return EINVAL;
} }
/* clear the interrupt */ /* clear the interrupt */
ser_interface = pci_inw(reg(SERIAL_INTERFACE_CTRL)); ser_interface = pci_inw(reg(SERIAL_INTERFACE_CTRL));