Changeset 1506 for trunk

Timestamp:

12/26/11 01:48:47 (17 months ago)

Author:

reyalp

Message:

disable odd special case for s95 added in r1505 (from 1459_elf3.patch)

Location:

trunk

Files:

• core/kbd.c (modified) (2 diffs)
• platform/s95/kbd.c (modified) (2 diffs)

trunk/core/kbd.c

@@ -175 +175 @@
     unsigned int drmode = 0;
 
+/*
 #if defined(CAMERA_s95)
                 extern volatile int kbd_KEY_RING_FUNC;
@@ -182 +183 @@
                 }
 #endif
-
+*/
 
     if(conf.ricoh_ca1_mode && conf.remote_enable) {

trunk/platform/s95/kbd.c

@@ -224 +224 @@
 
 
-volatile int kbd_KEY_RING_FUNC;
+//volatile int kbd_KEY_RING_FUNC;
 
 void my_kbd_read_keys()
@@ -235 +235 @@
 
         _GetKbdState(kbd_new_state);
-kbd_KEY_RING_FUNC = !(kbd_new_state[2]&0x4000);
+//kbd_KEY_RING_FUNC = !(kbd_new_state[2]&0x4000);