Changeset 389

Timestamp:

05/03/08 16:07:24 (5 years ago)

Author:

fingalo

Message:

 

Location:

trunk

Files:

• include/camera.h (modified) (1 diff)
• platform/a560/kbd.c (modified) (4 diffs)

trunk/include/camera.h

@@ -158 +158 @@
 
     #undef  CAM_USE_ZOOM_FOR_MF
-    #undef  CAM_REMOTE
     #define CAM_MULTIPART               1
     #undef  CAM_HAS_ERASE_BUTTON

trunk/platform/a560/kbd.c

@@ -1 +1 @@
 #include "lolevel.h"
 #include "platform.h"
+#include "conf.h"
 #include "core.h"
 #include "keyboard.h"
@@ -17 +18 @@
 static long last_kbd_key = 0;
 static int usb_power=0;
+static int remote_key, remote_count;
+#define USB_MASK (0x40000) 
+#define USB_REG 2
 
 
@@ -122 +126 @@
     }
 
-
-
     _kbd_read_keys_r2(physw_status);
+
+        if (conf.remote_enable) {
+                remote_key = (physw_status[2] & USB_MASK)==USB_MASK;
+                if (remote_key) 
+                        remote_count += 1;
+                else if (remote_count) {
+                        usb_power = remote_count;
+                        remote_count = 0;
+                }
+                physw_status[2] = physw_status[2] & ~(SD_READONLY_FLAG | USB_MASK);
+        }
+        else
     physw_status[2] = physw_status[2] & ~SD_READONLY_FLAG;
 
+
     _kbd_pwr_off();
 
 }
 
+int get_usb_power(int edge)
+{
+        int x;
+
+        if (edge) return remote_key;
+        x = usb_power;
+        usb_power = 0;
+        return x;
+}
 
 /* void kbd_set_alt_mode_key_mask(long key)
@@ -310 +334 @@
 };
 
-int get_usb_power(int edge) {return usb_power;}