2 files changed, 30 insertions, 3 deletions

diff --git a/firmware/drivers/adc.c b/firmware/drivers/adc.c
index c9e11e0f56..b71583ca05 100644
--- a/firmware/drivers/adc.c
+++ b/firmware/drivers/adc.c
@@ -113,9 +113,10 @@ static unsigned char adcdata[NUM_ADC_CHANNELS];
 #ifdef IRIVER_H300_SERIES
 static int channelnum[] =
 {
-    5,   /* ADC_BUTTONS */
-    6,   /* ADC_REMOTE */
-    0,   /* ADC_BATTERY */
+    5,   /* ADC_BUTTONS (ADCIN2) */
+    6,   /* ADC_REMOTE  (ADCIN3) */
+    0,   /* ADC_BATTERY (BATVOLT, resistive divider) */
+    2,   /* ADC_REMOTEDETECT (ADCIN1, resistive divider) */
 };
 
 unsigned char adc_scan(int channel)
@@ -212,6 +213,8 @@ static void adc_tick(void)
     {
         adc_counter = 0;
         adc_scan(ADC_BATTERY);
+        adc_scan(ADC_REMOTEDETECT); /* Temporary. Remove when the remote
+                                       detection feels stable. */
     }
 }
 
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c
index 0b9edf6c99..6bbe01a4c9 100644
--- a/firmware/drivers/lcd-h100-remote.c
+++ b/firmware/drivers/lcd-h100-remote.c
@@ -446,10 +446,19 @@ static void remote_lcd_init(void)
     lcd_remote_roll(cached_roll);
 }
 
+static int _remote_type = 0;
+
+int remote_type(void)
+{
+    return _remote_type;
+}
+
 /* Monitor remote hotswap */
 static void remote_tick(void)
 {
     bool current_status;
+    int val;
+    int level;
 
     current_status = ((GPIO_READ & 0x40000000) == 0);
     /* Only report when the status has changed */
@@ -468,6 +477,20 @@ static void remote_tick(void)
         {
             if (current_status)
             {
+                /* Determine which type of remote it is.
+                   The number 8 is just a fudge factor. */
+                level = set_irq_level(HIGHEST_IRQ_LEVEL);
+                val = adc_scan(ADC_REMOTEDETECT);
+                set_irq_level(level);
+
+                if(val < (ADCVAL_H100_LCD_REMOTE + 8))
+                    if(val < (ADCVAL_H300_LCD_REMOTE + 8))
+                        _remote_type = REMOTETYPE_H300_LCD;
+                    else
+                        _remote_type = REMOTETYPE_H100_LCD;
+                else
+                    _remote_type = REMOTETYPE_H300_NONLCD;
+                
                 init_remote = true;   
                 /* request init in scroll_thread */
             }
@@ -476,6 +499,7 @@ static void remote_tick(void)
                 CLK_LO;
                 CS_HI;
                 remote_initialized = false;
+                _remote_type = 0;
             }
         }
     }