len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 05:35:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sansa AMS: VIC_INT_ENABLE register is not a mask

Browse source 
When read it returns all enabled interrupt sources
When written it enables interrupt sources for each bit set
So just like VIC_INT_EN_CLEAR, we don't have to read the previous value
before writing to it (VIC_INT_EN_CLEAR is write-only anyway)

Thanks to Fred Bauer for spotting

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23734 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2009-11-24 12:05:53 +00:00
parent 4314ceb73b
commit ed13fd6dca
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/target/arm/as3525/ata_sd_as3525.c
View file

@ -456,11 +456,11 @@ static void init_pl180_controller(const int drive)
MCI_MASK0(drive) = MCI_ERROR | MCI_DATA_END; MCI_MASK0(drive) = MCI_ERROR | MCI_DATA_END;
MCI_MASK1(drive) = 0; MCI_MASK1(drive) = 0;
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
VIC_INT_ENABLE |= VIC_INT_ENABLE =
(drive == INTERNAL_AS3525) ? INTERRUPT_NAND : INTERRUPT_MCI0; (drive == INTERNAL_AS3525) ? INTERRUPT_NAND : INTERRUPT_MCI0;
/* setup isr for microsd monitoring */ /* setup isr for microsd monitoring */
VIC_INT_ENABLE |= (INTERRUPT_GPIOA); VIC_INT_ENABLE = (INTERRUPT_GPIOA);
/* clear previous irq */ /* clear previous irq */
GPIOA_IC = (1<<2); GPIOA_IC = (1<<2);
/* enable edge detecting */ /* enable edge detecting */
@ -469,7 +469,7 @@ static void init_pl180_controller(const int drive)
GPIOA_IBE |= (1<<2); GPIOA_IBE |= (1<<2);
#else #else
VIC_INT_ENABLE |= INTERRUPT_NAND; VIC_INT_ENABLE = INTERRUPT_NAND;
#endif #endif
MCI_POWER(drive) = MCI_POWER_UP | (MCI_VDD_3_0); /* OF Setting */ MCI_POWER(drive) = MCI_POWER_UP | (MCI_VDD_3_0); /* OF Setting */

2
firmware/target/arm/as3525/dma-pl081.c
View file

@ -49,7 +49,7 @@ void dma_release(void)
void dma_init(void) void dma_init(void)
{ {
DMAC_SYNC = 0xffff; /* disable synchronisation logic */ DMAC_SYNC = 0xffff; /* disable synchronisation logic */
VIC_INT_ENABLE |= INTERRUPT_DMAC; VIC_INT_ENABLE = INTERRUPT_DMAC;
} }
inline void dma_disable_channel(int channel) inline void dma_disable_channel(int channel)

2
firmware/target/arm/as3525/kernel-as3525.c
View file

@ -64,7 +64,7 @@ void tick_start(unsigned int interval_in_ms)
int cycles = KERNEL_TIMER_FREQ / 1000 * interval_in_ms; int cycles = KERNEL_TIMER_FREQ / 1000 * interval_in_ms;
CGU_PERI |= CGU_TIMER2_CLOCK_ENABLE; /* enable peripheral */ CGU_PERI |= CGU_TIMER2_CLOCK_ENABLE; /* enable peripheral */
VIC_INT_ENABLE |= INTERRUPT_TIMER2; /* enable interrupt */ VIC_INT_ENABLE = INTERRUPT_TIMER2; /* enable interrupt */
TIMER2_LOAD = TIMER2_BGLOAD = cycles; /* timer period */ TIMER2_LOAD = TIMER2_BGLOAD = cycles; /* timer period */

6
firmware/target/arm/as3525/pcm-as3525.c
View file

@ -51,7 +51,7 @@ void pcm_play_lock(void)
void pcm_play_unlock(void) void pcm_play_unlock(void)
{ {
if(--locked == 0) if(--locked == 0)
VIC_INT_ENABLE |= INTERRUPT_DMAC; VIC_INT_ENABLE = INTERRUPT_DMAC;
} }
static void play_start_pcm(void) static void play_start_pcm(void)
@ -196,7 +196,7 @@ void pcm_rec_lock(void)
void pcm_rec_unlock(void) void pcm_rec_unlock(void)
{ {
if(--rec_locked == 0) if(--rec_locked == 0)
VIC_INT_ENABLE |= INTERRUPT_I2SIN; VIC_INT_ENABLE = INTERRUPT_I2SIN;
} }
@ -275,7 +275,7 @@ void pcm_rec_dma_start(void *addr, size_t size)
I2SIN_MASK = (1<<6) | (1<<0) | I2SIN_MASK = (1<<6) | (1<<0) |
(1<<3) | (1<<2) | (1<<1); /* half full, almost full, full */ (1<<3) | (1<<2) | (1<<1); /* half full, almost full, full */
VIC_INT_ENABLE |= INTERRUPT_I2SIN; VIC_INT_ENABLE = INTERRUPT_I2SIN;
} }

2
firmware/target/arm/as3525/timer-as3525.c
View file

@ -56,7 +56,7 @@ bool timer_set(long cycles, bool start)
bool timer_start(void) bool timer_start(void)
{ {
CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE; /* enable peripheral */ CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE; /* enable peripheral */
VIC_INT_ENABLE |= INTERRUPT_TIMER1; VIC_INT_ENABLE = INTERRUPT_TIMER1;
return true; return true;
} }

2
firmware/target/arm/as3525/usb-drv-as3525.c
View file

@ -187,7 +187,7 @@ void usb_drv_init(void)
USB_DEV_EP_INTR_MASK &= ~((1<<0) | (1<<16)); /* ep 0 */ USB_DEV_EP_INTR_MASK &= ~((1<<0) | (1<<16)); /* ep 0 */
VIC_INT_ENABLE |= INTERRUPT_USB; VIC_INT_ENABLE = INTERRUPT_USB;
USB_IEP_CTRL(0) |= (1<<7); /* set NAK */ USB_IEP_CTRL(0) |= (1<<7); /* set NAK */
USB_OEP_CTRL(0) |= (1<<7); /* set NAK */ USB_OEP_CTRL(0) |= (1<<7); /* set NAK */