Changeset 365 for branches/msl

Timestamp:

08/13/10 10:13:01 (3 years ago)

Author:

msl

Message:

PTP-Interface

• Support für IXUS100 1.00c hinzugefügt, Danke CHDKLover.
• Funktion Windows-Programm chdkcam ist ungeprüft, Linux ist ok.

Location:

branches/msl

Files:

• include/camera.h (modified) (1 diff)
• platform/ixus100_sd780/lib.c (modified) (1 diff)
• platform/ixus100_sd780/sub/100c/boot.c (modified) (1 diff)
• platform/ixus100_sd780/sub/100c/lib.c (modified) (2 diffs)
• platform/ixus100_sd780/sub/100c/stubs_entry_2.S (modified) (1 diff)

branches/msl/include/camera.h

@@ -1822 +1822 @@
     // camera name
     #define PARAM_CAMERA_NAME           4           // parameter number for GetParameterData sd990: OK
+    
+    #define CAM_CHDK_PTP                1
 
 //----------------------------------------------------------

branches/msl/platform/ixus100_sd780/lib.c

@@ -64 +64 @@
 }
 
-
+void switch_mode(int mode) { //sollte immer so sein
+    if ( mode == 0 ) {
+        _Rec2PB();
+        _set_control_event(0x80000902); // 0x10A5 ConnectUSBCable
+    } else if ( mode == 1 ) {
+        _set_control_event(0x902); // 0x10A6 DisconnectUSBCable
+        _PB2Rec();
+   }
+}

branches/msl/platform/ixus100_sd780/sub/100c/boot.c

@@ -596 +596 @@
 //VERIFY_SD780 - What does this do for us?
 void CreateTask_spytask() {
-        _CreateTask("SpyTask", 0x19, 0x2000, core_spytask, 0);
+    _CreateTask("SpyTask", 0x19, 0x2000, core_spytask, 0);
+    _CreateTask("InitCHDKPTP", 0x19, 0x2000, init_chdk_ptp, 0);
 }
 

branches/msl/platform/ixus100_sd780/sub/100c/lib.c

@@ -63 +63 @@
 void *vid_get_viewport_fb_d()
 {
-    return (void*)(*(int*)(0x26F4 + 0x58));
+    //return (void*)(*(int*)(0x26F4 + 0x58));
+    int x=*(int*)(0x26F4 + 0x58);
+    // if we start camera in PB mode with movie on display, this pointer will be NULL
+    return (void*) (x ? x : 0xFFC00000) ;
 }
-
 
 //SD780 - 720px real screen width
@@ -105 +107 @@
 //VERIFY_SD780
 long vid_get_bitmap_buffer_height() { return 270; }
+
+long vid_get_image_buffer_width_for_ptp() 
+{ 
+    return 720; 
+} 
+
+//PTP
+long vid_get_image_width_for_ptp()
+{
+    return ((mode_get()&MODE_MASK) == MODE_PLAY)?720:*(int*)0x43BC; // VRAM DataSize --> FF8B1574 960?
+} 
+  
+  
+long vid_get_image_height_for_ptp()
+{
+    return ((mode_get()&MODE_MASK) == MODE_PLAY)?240:*(int*)(0x43BC+4); // VRAM DataSize 270?
+}
+
+void *vid_get_bitmap_fb_for_ptp()
+{
+    return (void*)(*(int*)(0x8378+0x14));
+}
+
+long vid_get_bitmap_buffer_width_for_ptp(){ return vid_get_bitmap_buffer_width();}
+long vid_get_bitmap_width_for_ptp() {return vid_get_bitmap_buffer_width();}
+long vid_get_bitmap_height_for_ptp() {return vid_get_bitmap_buffer_height();}
+
+unsigned int *vid_get_palette()
+{
+    static unsigned pal[16];
+    unsigned int*syspal= (unsigned int*)(0x4CB8+0x28);
+    int i;
+    for (i=0;i<16; i++) {  // big-endian to little-endian
+    pal[i] = (syspal[i]>>24) |
+             ((syspal[i]<<8) & 0x00FF0000) |
+             ((syspal[i]>>8) & 0x0000FF00) | 
+             (syspal[i]<<24);
+    }
+    return pal;
+}

branches/msl/platform/ixus100_sd780/sub/100c/stubs_entry_2.S

@@ -62 +62 @@
 NHSTUB(SetScriptMode, 0xDEADC0DE)
 
-
+//PTP
+NHSTUB(add_ptp_handler, 0xFF9EABDC) 
+NHSTUB(set_control_event, 0xFF873E74) // nicht sicher
+NHSTUB(PB2Rec, 0xFF8772BC) // via aAcPb2rec 
+NHSTUB(Rec2PB, 0xFF8772FC) // via aAcRec2pb