7 files changed, 33 insertions, 63 deletions

diff --git a/firmware/drivers/tsc2100.c b/firmware/drivers/tsc2100.c
index 09017996dc..b8edb7d52d 100644
--- a/firmware/drivers/tsc2100.c
+++ b/firmware/drivers/tsc2100.c
@@ -28,9 +28,6 @@
 /* adc_data contains the last readings from the tsc2100 */
 static short adc_data[10];
 static short adc_status;
-static long adc_last_read=0;
-static long adc_last_touch_read=0;
-static long adc_last_volt_read=0;
 
 void tsc2100_read_data(void)
 {
@@ -42,8 +39,6 @@ void tsc2100_read_data(void)
     
     adc_status|=tsc2100_readreg(TSSTAT_PAGE, TSSTAT_ADDRESS);
     
-    adc_last_read=current_tick;
-    
     spi_block_transfer(SPI_target_TSC2100,
                        out, sizeof(out), (char *)adc_data, sizeof(adc_data));
                        
@@ -54,11 +49,7 @@ void tsc2100_read_data(void)
 /* Read X, Y, Z1, Z2 touchscreen coordinates. */
 bool tsc2100_read_touch(short *x, short* y, short *z1, short *z2)
 {
-    /* Note: This could cause problems if the current tick is not reset in ~1.3
-     * years.  Noting this in the event that a suspend/resume function
-     * is added.
-     */
-    if( (adc_status&(3<<9)) && (adc_last_read - adc_last_touch_read>=0) ) {
+    if( adc_status&(3<<9) ) {
         *x      = adc_data[0];
         *y      = adc_data[1];
         *z1     = adc_data[2];
@@ -66,8 +57,6 @@ bool tsc2100_read_touch(short *x, short* y, short *z1, short *z2)
         
         adc_status&=~(3<<9);
         
-        adc_last_touch_read=current_tick;
-        
         return true;
     } else {
         return false;
@@ -76,13 +65,12 @@ bool tsc2100_read_touch(short *x, short* y, short *z1, short *z2)
 
 bool tsc2100_read_volt(short *bat1, short *bat2, short *aux)
 {
-    if( (adc_status&(7<<4)) && TIME_BEFORE(adc_last_volt_read, adc_last_read)) {
+    if( adc_status&(7<<4) ) {
         *bat1   = adc_data[5];
         *bat2   = adc_data[6];
         *aux    = adc_data[7];
         
         adc_status&=~(7<<4);
-        adc_last_volt_read=current_tick;
         return true;
     } else {
         return false;
@@ -110,7 +98,7 @@ void tsc2100_set_mode(bool poweron, unsigned char scan_mode)
 void tsc2100_adc_init(void)
 {
     /* Set the TSC2100 to read touchscreen */
-    tsc2100_set_mode(true, 0x01);
+    tsc2100_set_mode(true, 0x02);
 
     tsc2100_writereg(TSSTAT_PAGE, TSSTAT_ADDRESS, 
                      (0x1<<TSSTAT_PINTDAV_SHIFT) /* Data available only */
@@ -132,7 +120,6 @@ short tsc2100_readreg(int page, int address)
     return (in[0]<<8)|in[1];
 }
 
-
 void tsc2100_writereg(int page, int address, short value)
 {
     unsigned short command = (page << 11)|(address << 5);
diff --git a/firmware/target/arm/tms320dm320/app.lds b/firmware/target/arm/tms320dm320/app.lds
index 3437984f55..4e23b533a9 100644
--- a/firmware/target/arm/tms320dm320/app.lds
+++ b/firmware/target/arm/tms320dm320/app.lds
@@ -126,7 +126,7 @@ SECTIONS
     .fiqstack (NOLOAD) :
     {
        *(.stack)
-       . += 0x100;
+       . += 0x400;
        fiq_stack = .;
     } > IRAM
     
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
index 5df764620d..2acce7a695 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
@@ -42,6 +42,9 @@ void adc_init(void)
     
     /* Enable the tsc2100 interrupt */
     IO_INTC_EINT2 |= (1<<3); /* IRQ_GIO14 */
+    
+    /* Read all registers to make sure they are clear */
+    tsc2100_read_data();
 }
 
 /* Touchscreen data available interupt */
@@ -49,31 +52,11 @@ void GIO14(void)
 {
     /* Interrupts work properly when cleared first */
     IO_INTC_IRQ2 = (1<<3); /* IRQ_GIO14 == 35 */
-    
-    short tsadc = tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS);
-    short adscm = (tsadc&TSADC_ADSCM_MASK)>>TSADC_ADSCM_SHIFT;
-    
+
     /* Always read all registers in one go to clear any missed flags */
     tsc2100_read_data();
     
-    switch (adscm)
-    {
-        case 0x01:
-        case 0x02:
-        case 0x03:
-        case 0x04:
-        case 0x05:
-            /* do a battery read - this will shutdown the adc till the next tick
-             */
-//            tsc2100_set_mode(true, 0x0B); 
-            break;
-        case 0x06:
-        case 0x07:
-        case 0x08:
-        case 0x09:
-        case 0x0B:
-            tsc2100_set_mode(true, 0x01);
-            break;
-    }    
+    /* Stop the scan, firmware will initiate another scan with a mode set */
+    tsc2100_set_mode(true, 0x00);  
 }
 
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
index 7d9a43f902..3aa6009c9e 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c
@@ -128,7 +128,7 @@ int button_read_device(int *data)
         button_read |= touchscreen_to_pixels(touch_x, touch_y, data);
     }
 
-    tsc2100_set_mode(true, 0x01);
+    tsc2100_set_mode(true, 0x02);
         
     /* Handle power button */
     if ((IO_GIO_BITSET0&0x01) == 0) {
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index cdec2ab77c..02294100ac 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -61,6 +61,9 @@ void pcm_play_dma_init(void)
     IO_INTC_IRQ0 = 1 << 11;
     IO_INTC_EINT0 |= 1 << 11;
     
+    /* Set this as a FIQ */
+    IO_INTC_FISEL0 |= 1 << 11;
+    
     IO_DSPC_HPIB_CONTROL = 1 << 10 | 1 << 9 | 1 << 8 | 1 << 7 | 1 << 3 | 1 << 0;
     
     dsp_reset();
@@ -133,7 +136,7 @@ void DSPHINT(void)
         
     unsigned int i;
 
-    IO_INTC_IRQ0 = 1 << 11;
+    IO_INTC_FIQ0 = 1 << 11;
     
     switch (dsp_message.msg) 
     {
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
index 6e361aac15..d0f1a0bf59 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
@@ -68,17 +68,14 @@ unsigned int battery_adc_voltage(void)
         current_bat2=((short)((int)(bat2<<10)/4096*6*2.5));
         current_aux=((short)((int)(aux<<10)/4096*6*2.5));
     }
-
-    if (TIME_BEFORE(last_tick+2*HZ, current_tick) || last_tick==0)
+    
+    tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS);
+    
+    /* Set the TSC2100 to read voltages if not busy with pen */
+    if(!(tsadc & TSADC_PSTCM))
     {
-        tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS);
-        
-        /* Set the TSC2100 to read voltages if not busy with pen */
-        if(!(tsadc & TSADC_PSTCM))
-        {
-            tsc2100_set_mode(true, 0x0B);
-            last_tick = current_tick;
-        }
+        tsc2100_set_mode(true, 0x0B);
+        last_tick = current_tick;
     }
         
     return current_voltage;
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index 434b0065a5..9dff1afc20 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -155,17 +155,17 @@ void fiq_handler(void)
      * Based on: linux/arch/arm/kernel/entry-armv.S and system-meg-fx.c
      */
 
-    asm volatile (
-        "sub    lr, lr, #4            \r\n"
-        "stmfd  sp!, {r0-r3, ip, lr}  \r\n"
-        "mov    r0, #0x00030000       \r\n"
-        "ldr    r0, [r0, #0x510]      \r\n" /* Fetch value from IO_INTC_FIQENTRY0 */
-        "sub    r0, r0, #1            \r\n"
-        "ldr    r1, =irqvector        \r\n"
-        "ldr    r1, [r1, r0, lsl #2]  \r\n" /* Divide value by 4 (TBA0/TBA1 is set to 0) and load appropriate pointer from the vector list */
-        "blx    r1                    \r\n" /* Jump to handler */
-        "ldmfd  sp!, {r0-r3, ip, pc}^ \r\n" /* Return from FIQ */
-    );
+    asm volatile(   "stmfd sp!, {r0-r7, ip, lr} \n"   /* Store context */
+                    "sub   sp, sp, #8           \n"); /* Reserve stack */
+    unsigned short addr = IO_INTC_FIQENTRY0>>2;
+    if(addr != 0)
+    {
+        addr--;
+        irqvector[addr]();
+    }
+    asm volatile(   "add   sp, sp, #8           \n"   /* Cleanup stack   */
+                    "ldmfd sp!, {r0-r7, ip, lr} \n"   /* Restore context */
+                    "subs  pc, lr, #4           \n"); /* Return from FIQ */
 }
 
 void system_reboot(void)