Changeset 942

Timestamp:

02/05/12 14:10:17 (16 months ago)

Author:

rudi_de

Message:

Wiederangleichen von CHDK und CHDK-DE (Teil 1)
​http://chdk.setepontos.com/index.php?topic=7601

Betrifft alle Kameras

• USB Mode-Umschaltung an CHDK angeglichen

Location:

trunk

Files:

• include/lolevel.h (modified) (1 diff)
• platform/a1000/lib.c (modified) (1 diff)
• platform/a1100/lib.c (modified) (1 diff)
• platform/a2000/lib.c (modified) (1 diff)
• platform/a3000/lib.c (modified) (1 diff)
• platform/a3300/lib.c (modified) (1 diff)
• platform/a410/lib.c (modified) (1 diff)
• platform/a430/lib.c (modified) (1 diff)
• platform/a450/lib.c (modified) (1 diff)
• platform/a460/lib.c (modified) (1 diff)
• platform/a470/lib.c (modified) (1 diff)
• platform/a480/lib.c (modified) (1 diff)
• platform/a490/lib.c (modified) (1 diff)
• platform/a495/lib.c (modified) (1 diff)
• platform/a530/lib.c (modified) (1 diff)
• platform/a540/lib.c (modified) (1 diff)
• platform/a550/lib.c (modified) (1 diff)
• platform/a560/lib.c (modified) (1 diff)
• platform/a570/lib.c (modified) (1 diff)
• platform/a580/lib.c (modified) (1 diff)
• platform/a590/lib.c (modified) (1 diff)
• platform/a610/lib.c (modified) (1 diff)
• platform/a620/lib.c (modified) (1 diff)
• platform/a630/lib.c (modified) (1 diff)
• platform/a640/lib.c (modified) (1 diff)
• platform/a650/lib.c (modified) (1 diff)
• platform/a700/lib.c (modified) (1 diff)
• platform/a710/lib.c (modified) (1 diff)
• platform/a720/lib.c (modified) (1 diff)
• platform/d10/lib.c (modified) (1 diff)
• platform/g10/lib.c (modified) (1 diff)
• platform/g11/lib.c (modified) (1 diff)
• platform/g12/lib.c (modified) (1 diff)
• platform/g7/lib.c (modified) (1 diff)
• platform/g9/lib.c (modified) (1 diff)
• platform/generic/lib.c (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)
• platform/ixus1000_sd4500/lib.c (modified) (1 diff)
• platform/ixus100_sd780/lib.c (modified) (1 diff)
• platform/ixus120_sd940/lib.c (modified) (1 diff)
• platform/ixus200_sd980/lib.c (modified) (1 diff)
• platform/ixus220_elph300hs/lib.c (modified) (1 diff)
• platform/ixus230_elph310hs/lib.c (modified) (1 diff)
• platform/ixus300_sd4000/lib.c (modified) (1 diff)
• platform/ixus310_elph500hs/lib.c (modified) (1 diff)
• platform/ixus40_sd300/lib.c (modified) (1 diff)
• platform/ixus50_sd400/lib.c (modified) (1 diff)
• platform/ixus55_sd450/lib.c (modified) (1 diff)
• platform/ixus60_sd600/lib.c (modified) (1 diff)
• platform/ixus65_sd630/lib.c (modified) (1 diff)
• platform/ixus700_sd500/lib.c (modified) (1 diff)
• platform/ixus70_sd1000/lib.c (modified) (1 diff)
• platform/ixus750_sd550/lib.c (modified) (1 diff)
• platform/ixus75_sd750/lib.c (modified) (1 diff)
• platform/ixus800_sd700/lib.c (modified) (1 diff)
• platform/ixus80_sd1100/lib.c (modified) (1 diff)
• platform/ixus850_sd800/lib.c (modified) (1 diff)
• platform/ixus85_sd770/lib.c (modified) (1 diff)
• platform/ixus860_sd870/lib.c (modified) (1 diff)
• platform/ixus870_sd880/lib.c (modified) (1 diff)
• platform/ixus900_sd900/lib.c (modified) (1 diff)
• platform/ixus90_sd790/lib.c (modified) (1 diff)
• platform/ixus950_sd850/lib.c (modified) (1 diff)
• platform/ixus95_sd1200/lib.c (modified) (1 diff)
• platform/ixus960_sd950/lib.c (modified) (1 diff)
• platform/ixus970_sd890/lib.c (modified) (1 diff)
• platform/ixus980_sd990/lib.c (modified) (1 diff)
• platform/ixusizoom_sd30/lib.c (modified) (1 diff)
• platform/s2is/lib.c (modified) (1 diff)
• platform/s3is/lib.c (modified) (1 diff)
• platform/s5is/lib.c (modified) (1 diff)
• platform/s90/lib.c (modified) (1 diff)
• platform/s95/lib.c (modified) (1 diff)
• platform/sx1/lib.c (modified) (1 diff)
• platform/sx10/lib.c (modified) (1 diff)
• platform/sx100is/lib.c (modified) (1 diff)
• platform/sx110is/lib.c (modified) (1 diff)
• platform/sx120is/lib.c (modified) (1 diff)
• platform/sx130is/lib.c (modified) (1 diff)
• platform/sx150is/lib.c (modified) (1 diff)
• platform/sx20/lib.c (modified) (1 diff)
• platform/sx200is/lib.c (modified) (1 diff)
• platform/sx220hs/lib.c (modified) (1 diff)
• platform/sx230hs/lib.c (modified) (1 diff)
• platform/sx30/lib.c (modified) (1 diff)
• platform/sx40hs/lib.c (modified) (1 diff)
• platform/tx1/lib.c (modified) (1 diff)

trunk/include/lolevel.h

@@ -293 +293 @@
 #ifdef CAM_CHDK_PTP
 extern int _add_ptp_handler(int, void*, int);
+extern void _set_control_event(int);
+extern void _PB2Rec();
+extern void _Rec2PB();
 #endif
 

trunk/platform/a1000/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a1100/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 #define LED_DP      0xC02200CC    // direct-print (blue)

trunk/platform/a2000/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 #define LED_PR  0xc02200C4

trunk/platform/a3000/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a3300/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a410/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a430/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a450/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a460/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a470/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a480/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/a490/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 // only two LEDs in A490:

trunk/platform/a495/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 // only two LEDs in A495:

trunk/platform/a530/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){ 

trunk/platform/a540/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){ // from 710 added 

trunk/platform/a550/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a560/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a570/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a580/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a590/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 extern void my_debug_led();

trunk/platform/a610/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a620/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a630/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a640/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a650/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/a700/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a710/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/a720/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/d10/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/g10/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()    // G10 : ixus980_sd990 version seems to work well

trunk/platform/g11/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/g12/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/g7/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/g9/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/generic/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "levent.h"
-
-#ifdef CAM_DRYOS  //DryOS
-
-    extern void _set_control_event(int);
-    extern void _PB2Rec();
-    extern void _Rec2PB();
-    int switch_mode_usb(int mode) {
-    #ifdef CAM_CHDK_PTP
-        if ( mode == 0 ) {
-            _Rec2PB();
-            _set_control_event(0x80000000|CAM_USB_EVENTID); // ConnectUSBCable 0x10A5 (0x10B3 in DryOS R49)
-        } else if ( mode == 1 ) {
-            _set_control_event(CAM_USB_EVENTID); // DisconnectUSBCable 0x10A6 (0x10B4 in DryOS R49)
-            _PB2Rec();
-        } else return 0;
-        return 1;
-    #else
-        return 0;
-    #endif  //CAM_CHDK_PTP
-    }
-
-#else  //VxWorks
-
-    int switch_mode_usb(int mode) {
-        if ( mode == 0 ) {
-            levent_set_play();
-        } else if ( mode == 1 ) {
-            levent_set_record();
-        } else return 0;
-        return 1;
-    }
-
-#endif  //CAM_DRYOS

trunk/platform/generic/wrappers.c

@@ -1284 +1284 @@
 #endif
 
-
+// TODO mode switch function should detect if USB is connected or not,
+// and do regular or special switch as needed
+#ifdef CAM_DRYOS
 int __attribute__((weak)) switch_mode_usb(int mode)
 {
-
-    return 0;
-}
+#ifdef CAM_CHDK_PTP
+    if ( mode == 0 ) {
+        _Rec2PB();
+        _set_control_event(0x80000000|CAM_USB_EVENTID); // ConnectUSBCable 0x10A5 (0x10B3 in DryOS R49)
+    } else if ( mode == 1 ) {
+        _set_control_event(CAM_USB_EVENTID); // DisconnectUSBCable 0x10A6 (0x10B4 in DryOS R49)
+        _PB2Rec();
+    } else return 0;
+    return 1;
+#else
+  return 0;
+#endif // CAM_CHDK_PTP
+}
+
+#else // vxworks
+// this doesn't need any special functions so it's defined even without CHDK_CAM_PTP
+int __attribute__((weak)) switch_mode_usb(int mode)
+{
+    if ( mode == 0 ) {
+        levent_set_play();
+    } else if ( mode == 1 ) {
+        levent_set_record();
+    } else return 0;
+    return 1;
+}
+#endif // vxworks
 
 /*

trunk/platform/ixus1000_sd4500/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 /*

trunk/platform/ixus100_sd780/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixus120_sd940/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 #define LED_GREEN  0xC0220130

trunk/platform/ixus200_sd980/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 extern int enabled_refresh_physical_screen;

trunk/platform/ixus220_elph300hs/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixus230_elph310hs/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixus300_sd4000/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown() {

trunk/platform/ixus310_elph500hs/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixus40_sd300/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 #define PARAM_FILE_COUNTER      0x2E
-#include "../generic/lib.c"
 
 extern void _sub_FF821D04(long mem, long *data);

trunk/platform/ixus50_sd400/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus55_sd450/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus60_sd600/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/ixus65_sd630/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/ixus700_sd500/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus70_sd1000/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 //define LED_AF    0xc02200C0 // found in "taskcreate_LEDCon"

trunk/platform/ixus750_sd550/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus75_sd750/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 //define LED_AF    0xc02200C0 // found in "taskcreate_LEDCon"

trunk/platform/ixus800_sd700/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/ixus80_sd1100/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "leds.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus850_sd800/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 //define LED_AF    0xc02200C0 // found in "taskcreate_LEDCon"

trunk/platform/ixus85_sd770/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 #include "leds.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus860_sd870/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus870_sd880/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixus900_sd900/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 /* led addresses, look in function "taskcreate_LEDCon" ROM:FF82F958 (branch to ROM:FF82FEC8)

trunk/platform/ixus90_sd790/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 #include "leds.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus950_sd850/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/ixus95_sd1200/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 #include "sd1200_debug.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixus960_sd950/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus970_sd890/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 #include "leds.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/ixus980_sd990/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/ixusizoom_sd30/lib.c

@@ -1 @@
-#include "../generic/lib.c"
 
 int get_flash_params_count(void){

trunk/platform/s2is/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/s3is/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/s5is/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 #define LED_PR 0xC02200D4

trunk/platform/s90/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/s95/lib.c

@@ -2 +2 @@
 #include "lolevel.h"
 #include "gui.h"
-#include "../generic/lib.c"
 
 static char*    frame_buffer[2];

trunk/platform/sx1/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/sx10/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/sx100is/lib.c

@@ -1 +1 @@
 #include "platform.h"
-#include "../generic/lib.c"
 
 void shutdown()

trunk/platform/sx110is/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 #define LED_PR  0xc02200C4

trunk/platform/sx120is/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 #define LED_AF          0xC022000C

trunk/platform/sx130is/lib.c

@@ -92 +92 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 /*

trunk/platform/sx150is/lib.c

@@ -92 +92 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 /*

trunk/platform/sx20/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/sx200is/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/sx220hs/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/sx230hs/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 

trunk/platform/sx30/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/sx40hs/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void vid_bitmap_refresh()

trunk/platform/tx1/lib.c

@@ -1 +1 @@
 #include "platform.h"
 #include "lolevel.h"
-#include "../generic/lib.c"
 
 void shutdown()