1300d port take 2

platform/1300D.120/Makefile

@@ -0,0 +1,28 @@
+#Makefile for 1300D
+
+MODEL = 1300D
+FW_VERSION = 120
+
+TOP_DIR = ../..
+
+# WTF
+AUTOEXEC_BASE = 0x800000
+# WTF
+FIR_BASE = 0x800120
+
+MAIN_FIRMWARE_ADDR = 0xFE0C0000
+PLATFORM_ARCH = armv5te
+
+# Load ML at the end of the AllocateMemory pool
+# Default 0x2D0000 - 0xD00000, patched to 0x2D0000 - 0xC80000 (512K for us).
+RESTARTSTART = 0xC80000
+ML_BOOT_OBJ = boot-d45-ch.o
+ML_SRC_EXTRA_OBJS = $(BUILD_DIR)/reloc.o
+
+ML_SRC_EXTRA_OBJS += function_overrides.o
+
+# 1300D_101.sym is to long
+ML_MODULES_SYM_NAME=t6_$(FW_VERSION).sym
+
+include ../Makefile
+.DEFAULT_GOAL := $(BUILD_DIR)/cam_complete

platform/1300D.120/Makefile.platform.default

@@ -0,0 +1,17 @@
+# 1300D 1.2.0
+
+# no 1300D firmware yet?
+CANON_NAME_FIR      = CCF17120.FIR
+FIRMWARE_ID         = 0x80000404
+
+# the only DIGIC 4 model with 32MB ROM
+ROMBASEADDR         = 0xFE0C0000
+
+# Load ML at the end of the AllocateMemory pool
+# Default 0x2D0000 - 0xD00000, patched to 0x2D0000 - 0xC80000 (512K for us).
+RESTARTSTART        = 0xC80000
+ML_BOOT_OBJ         = boot-d45-ch.o
+
+PLATFORM_ARCH = armv5te
+
+ML_SRC_EXTRA_OBJS += function_overrides.o

platform/1300D.120/Makefile.setup.default

@@ -0,0 +1,6 @@
+#Makefile for 1300D
+
+#CONFIG_LVAPP_HACK_RELOC = y
+
+# 1300D_101.sym is to long
+ML_MODULES_SYM_NAME=t6_$(FW_VERSION).sym

platform/1300D.120/cfn.c

@@ -0,0 +1,17 @@
+#include <dryos.h>
+#include <property.h>
+#include <cfn-generic.h>
+
+// look on camera menu or review sites to get custom function numbers
+
+int get_htp() { return GetCFnData(0, 5); }
+void set_htp(int value) { SetCFnData(0, 5, value); }
+
+// No MLU on the 1300D :(
+int get_mlu() { return 0; }
+void set_mlu(int value) { return; }
+
+int cfn_get_af_button_assignment() { return GetCFnData(0, 7); }
+void cfn_set_af_button(int value) { SetCFnData(0, 7, value); }
+
+GENERIC_GET_ALO

platform/1300D.120/consts.h

@@ -0,0 +1,286 @@
+/*
+ *  1300D 1.1.0 consts
+ */
+
+#define CANON_SHUTTER_RATING 100000
+
+#define CARD_LED_ADDRESS 0xC0220134 // http://magiclantern.wikia.com/wiki/Led_addresses
+#define LEDON 0x46
+#define LEDOFF 0x44
+
+
+
+#define HIJACK_CACHE_HACK
+
+#define HIJACK_CACHE_HACK_BSS_END_ADDR   0xFE0C1B74
+#define HIJACK_CACHE_HACK_BSS_END_INSTR  0xE3A01732 // should be the correct INSTRUCTION MOV R1, 0xc80000
+#define HIJACK_CACHE_HACK_INITTASK_ADDR  0xFE0C3B20
+
+#define HIJACK_INSTR_BL_CSTART  0xFE0C0638
+#define HIJACK_INSTR_BSS_END 0xFE0C3B10
+#define HIJACK_FIXBR_BZERO32 0xFE0C3A58
+#define HIJACK_FIXBR_CREATE_ITASK 0xFE0C3AF8
+#define HIJACK_INSTR_MY_ITASK 0xFE0C3B20
+
+// Used in boot-hack.c with CONFIG_ALLOCATE_MEMORY_POOL
+//#define ROM_ITASK_START 0xFE1296C8
+//#define ROM_ITASK_END 0xFE1296C8//0xfe129bd8 // 0xFE1298A0 //fe12b8bc FE1298A0
+//#define ROM_CREATETASK_MAIN_START 0xfe0c1b60 
+//#define ROM_CREATETASK_MAIN_END 0xfe0c1eb0
+//#define ROM_ALLOCMEM_END 0xfe0c1b74
+//#define ROM_ALLOCMEM_INIT 0xfe0c1b7c //(ROM_ALLOCMEM_END + 8) 
+//#define ROM_B_CREATETASK_MAIN 0xfe129760
+
+/* new-style DryOS hooks? */
+//#define HIJACK_TASK_ADDR 0x31170
+
+//#define ARMLIB_OVERFLOWING_BUFFER 0x167FC // in AJ_armlib_setup_related3 // this is deactivated in config for this camera, maybe we need to activate it again
+
+#define DRYOS_ASSERT_HANDLER 0x35888 // dec TH_assert or assert_0 // not sure
+
+// these were found in ROM, but not tested yet
+#define MVR_992_STRUCT (*(void**)(0x315dc+0x4)) // look in MVR_Initialize for AllocateMemory call
+
+#define div_maybe(a,b) ((a)/(b))
+
+// see mvrGetBufferUsage, which is not really safe to call => err70
+// macros copied from arm-console
+#define MVR_BUFFER_USAGE_FRAME ABS(div_maybe(-100*MEM(356 + MVR_992_STRUCT) - 100*MEM(364 + MVR_992_STRUCT) - 100*MEM(952 + MVR_992_STRUCT) - 100*MEM(960 + MVR_992_STRUCT) + 100*MEM(360 + MVR_992_STRUCT) + 100*MEM(368 + MVR_992_STRUCT), -MEM(356 + MVR_992_STRUCT) - MEM(364 + MVR_992_STRUCT) + MEM(360 + MVR_992_STRUCT) + MEM(368 + MVR_992_STRUCT)))
+#define MVR_BUFFER_USAGE_SOUND div_maybe(-100*MEM(544 + MVR_992_STRUCT) + 100*MEM(532 + MVR_992_STRUCT), 0xa)
+#define MVR_BUFFER_USAGE MAX(MVR_BUFFER_USAGE_FRAME, MVR_BUFFER_USAGE_SOUND)
+
+#define MVR_FRAME_NUMBER (*(int*)(332 + MVR_992_STRUCT)) // in mvrSMEncodeDone 0x14C=332
+#define MVR_BYTES_WRITTEN MEM((296 + MVR_992_STRUCT)) //in mvrSMEncodeDone
+
+#define MOV_RES_AND_FPS_COMBINATIONS 9
+#define MOV_OPT_NUM_PARAMS 2
+#define MOV_GOP_OPT_NUM_PARAMS 5
+#define MOV_OPT_STEP 5
+#define MOV_GOP_OPT_STEP 5
+
+ #define AUDIO_MONITORING_HEADPHONES_CONNECTED (!((*(int*)0xc0220070) & 1))
+//#define HOTPLUG_VIDEO_OUT_PROP_DELIVER_ADDR 0x1a8c // this prop_deliver performs the action for Video Connect and Video Disconnect  // not present on 1300D (see FE0C69C8: taskHotPlug)
+//#define HOTPLUG_VIDEO_OUT_STATUS_ADDR 0x1ac4 // passed as 2nd arg to prop_deliver; 1 = display connected, 0 = not, other values disable this event (trick)  // not present on 1300D (see FE0C69C8: taskHotPlug)
+
+
+// 720x480, changes when external monitor is connected
+ #define YUV422_LV_BUFFER_1 0x40d07800 
+ #define YUV422_LV_BUFFER_2 0x4c233800
+ #define YUV422_LV_BUFFER_3 0x4f11d800
+
+ #define REG_EDMAC_WRITE_LV_ADDR 0xc0f04308 // SDRAM address of LV buffer (aka VRAM)
+ #define REG_EDMAC_WRITE_HD_ADDR 0xc0f04208 // SDRAM address of HD buffer (aka YUV)
+
+#define YUV422_LV_BUFFER_DISPLAY_ADDR (*(uint32_t*)0x318C8)
+#define YUV422_HD_BUFFER_DMA_ADDR (shamem_read(REG_EDMAC_WRITE_HD_ADDR))
+
+// changes during record
+ #define YUV422_HD_BUFFER_1 0x44000080
+ #define YUV422_HD_BUFFER_2 0x46000080
+ #define YUV422_HD_BUFFER_3 0x48000080
+ #define YUV422_HD_BUFFER_4 0x4e000080
+ #define YUV422_HD_BUFFER_5 0x50000080
+
+
+// guess
+#define FOCUS_CONFIRMATION (*(int*)(0x36EC0 + 0x4)) // see "focusinfo" and Wiki:Struct_Guessing
+#define HALFSHUTTER_PRESSED (*(int*)(0x359A0 + 0x1C)) // look for string "[MC] permit LV instant"
+
+//~ #define AF_BUTTON_PRESSED_LV 0
+
+//~ #define DISPLAY_SENSOR (*(int*)0x2dec)
+//~ #define DISPLAY_SENSOR_ACTIVE (*(int*)0xC0220104)
+#define DISPLAY_SENSOR_POWERED (*(int*)(0x359A0 + 0x18))  // Look up *"ForceDisableDisplay (%d)"
+
+// for gui_main_task
+#define GMT_NFUNCS 7
+#define GMT_FUNCTABLE 0xfe8520fc
+
+#define LV_BOTTOM_BAR_DISPLAYED (((*(int8_t*)0x3830C) == 0xF) || ((*(int8_t*)0x3FE14) != 0x17))
+#define LV_BOTTOM_BAR_STATE (*(uint8_t*)0x3AA80) // in JudgeBottomInfoDispTimerState, if bottom bar state is 2, Judge returns 0; ML will make it 0 to hide bottom bar
+#define ISO_ADJUSTMENT_ACTIVE ((*(int*)0x3830C) == 0xF)
+#define SHOOTING_MODE (*(int*)0x3592C)
+#define UNAVI_FEEDBACK_TIMER_ACTIVE (MEM(0x3FE14) != 0x17) // dec CancelUnaviFeedBackTimer
+
+ #define COLOR_FG_NONLV 80
+
+
+
+
+
+ #define AE_STATE (*(int8_t*)(0x3AA80 + 0x1C))
+ #define AE_VALUE (*(int8_t*)(0x3AA80 + 0x1D))
+
+#define CURRENT_GUI_MODE (*(int*)0x36560) // GUIMode_maybe
+#define GUIMODE_WB 5
+#define GUIMODE_FOCUS_MODE 9
+#define GUIMODE_DRIVE_MODE 8
+#define GUIMODE_PICTURE_STYLE 4
+#define GUIMODE_PLAY 1
+#define GUIMODE_MENU 2
+#define GUIMODE_Q_UNAVI 0x1F
+#define GUIMODE_FLASH_AE 0x22
+#define GUIMODE_PICQ 6
+ #define GUIMODE_MOVIE_ENSURE_A_LENS_IS_ATTACHED (CURRENT_GUI_MODE == 0x1e)
+ #define GUIMODE_MOVIE_PRESS_LV_TO_RESUME (CURRENT_GUI_MODE == 0x1f)
+//~ #define GUIMODE_MOVIE_ENSURE_A_LENS_IS_ATTACHED 0 // not good
+//~ #define GUIMODE_MOVIE_PRESS_LV_TO_RESUME 0
+
+ #define PLAY_MODE (gui_state == GUISTATE_PLAYMENU && CURRENT_GUI_MODE == GUIMODE_PLAY)
+ #define MENU_MODE (gui_state == GUISTATE_PLAYMENU && CURRENT_GUI_MODE == GUIMODE_MENU)
+
+
+
+// position for ML ISO disp outside LV
+#define MENU_DISP_ISO_POS_X 527
+#define MENU_DISP_ISO_POS_Y 45
+
+//position for ML MAX ISO
+#define MAX_ISO_POS_X 590
+#define MAX_ISO_POS_Y 28
+
+// for ML hdr display
+#define HDR_STATUS_POS_X 562
+#define HDR_STATUS_POS_Y 100
+
+//for HTP mode on display
+#define HTP_STATUS_POS_X 500
+#define HTP_STATUS_POS_Y 233
+
+//for Mirror Lock Up enabled on display
+#define MLU_STATUS_POS_X 316
+#define MLU_STATUS_POS_Y 310
+
+#define WBS_GM_POS_X 365
+#define WBS_GM_POS_Y 230
+
+#define WBS_POS_X 365
+#define WBS_POS_Y 260
+
+// Audio remote shot position info photo mode
+#define AUDIO_REM_SHOT_POS_X 200
+#define AUDIO_REM_SHOT_POS_Y 386
+
+// position for displaying clock outside LV
+#define DISPLAY_CLOCK_POS_X 440
+#define DISPLAY_CLOCK_POS_Y 410
+
+// position for displaying K icon in photo info display
+#define WB_K_ICON_POS_X 192
+#define WB_K_ICON_POS_Y 226
+
+// position for displaying K values in photo info display
+#define WB_KELVIN_POS_X 192
+#define WB_KELVIN_POS_Y 260
+
+// position for displaying card size remain outside LV
+#define DISPLAY_GB_POS_X 305
+#define DISPLAY_GB_POS_Y 410
+
+#define DISPLAY_DATE_POS_X 425
+#define DISPLAY_DATE_POS_Y 445
+
+#define DISPLAY_BATTERY_POS_X 350
+#define DISPLAY_BATTERY_POS_Y 400
+
+// for displaying TRAP FOCUS msg outside LV
+#define DISPLAY_TRAP_FOCUS_POS_X 65
+#define DISPLAY_TRAP_FOCUS_POS_Y 360
+#define DISPLAY_TRAP_FOCUS_MSG       "TRAP FOCUS"
+#define DISPLAY_TRAP_FOCUS_MSG_BLANK "          "
+
+// In bindGUIEventFromGUICBR, look for "LV Set" => arg0 = 8
+// Next, in SetGUIRequestMode, look at what code calls NotifyGUIEvent(8, something)
+#define GUIMODE_ML_MENU (RECORDING ? 0 : lv ? 68 : 2)
+
+#define NUM_PICSTYLES 10
+
+
+#define FLASH_MAX_EV 3
+#define FLASH_MIN_EV -5
+#define FASTEST_SHUTTER_SPEED_RAW 152
+#define MAX_AE_EV 5
+
+
+#define DIALOG_MnCardFormatBegin   (0x46520+4) // ret_CreateDialogBox(...DlgMnCardFormatBegin_handler...) is stored there
+#define DIALOG_MnCardFormatExecute (0x4A65C+4) // ret_CreateDialogBox(...DlgMnCardFormatBegin_handler...) is stored there
+#define FORMAT_BTN_NAME "[Q]"
+#define FORMAT_BTN BGMT_Q
+#define FORMAT_STR_LOC 11
+
+#define BULB_MIN_EXPOSURE 1000
+
+// http://magiclantern.wikia.com/wiki/Fonts
+#define BFNT_CHAR_CODES    0xff23eb08
+#define BFNT_BITMAP_OFFSET 0xff241a58
+#define BFNT_BITMAP_DATA   0xff2449a8
+
+
+// from CFn
+#define AF_BTN_HALFSHUTTER 0
+#define AF_BTN_STAR 1
+
+#define IMGPLAY_ZOOM_LEVEL_ADDR (0x3B088+12) // dec GuiImageZoomDown and look for a negative counter
+#define IMGPLAY_ZOOM_LEVEL_MAX 14
+#define IMGPLAY_ZOOM_POS_X MEM(0x6FCC4) // Zoom CentrePos Look up *"CentrePos x:%ld y:%ld"
+#define IMGPLAY_ZOOM_POS_Y MEM(0x6FCC4+0x4) // Look up *"CentrePos x:%ld y:%ld"
+#define IMGPLAY_ZOOM_POS_X_CENTER 0x144
+#define IMGPLAY_ZOOM_POS_Y_CENTER 0xd8
+#define IMGPLAY_ZOOM_POS_DELTA_X (0x144 - 0x93)
+#define IMGPLAY_ZOOM_POS_DELTA_Y (0xd8 - 0x7d)
+
+#define BULB_EXPOSURE_CORRECTION 100 // min value for which bulb exif is OK [not tested]
+
+#define WINSYS_BMP_DIRTY_BIT_NEG MEM(0x3DBAC+0x2C) // see http://magiclantern.wikia.com/wiki/VRAM/BMP
+
+// manual exposure overrides
+#define LVAE_STRUCT 0x3B7A4
+#define CONTROL_BV      (*(uint16_t*)(LVAE_STRUCT+0x1c)) // EP_SetControlBv
+#define CONTROL_BV_TV   (*(uint16_t*)(LVAE_STRUCT+0x1e)) // EP_SetControlParam
+#define CONTROL_BV_AV   (*(uint16_t*)(LVAE_STRUCT+0x20))
+#define CONTROL_BV_ISO  (*(uint16_t*)(LVAE_STRUCT+0x22))
+#define CONTROL_BV_ZERO (*(uint16_t*)(LVAE_STRUCT+0x24))
+#define LVAE_ISO_SPEED  (*(uint8_t* )(LVAE_STRUCT))      // offset 0x0; at 3 it changes iso very slowly
+#define LVAE_ISO_MIN    (*(uint8_t* )(LVAE_STRUCT+0x2a)) // string: ISOMin:%d
+#define LVAE_ISO_HIS    (*(uint8_t* )(LVAE_STRUCT+0x2c)) // no idea what this is
+#define LVAE_DISP_GAIN  (*(uint16_t*)(LVAE_STRUCT+0x26)) // lvae_setdispgain
+#define LVAE_MOV_M_CTRL (*(uint8_t* )(LVAE_STRUCT+0x78)) // lvae_setmoviemanualcontrol
+
+#define DISPLAY_ORIENTATION MEM(0x31818+0x7C) // read-only; string: UpdateReverseTFT
+
+#define MIN_MSLEEP 20
+
+#define INFO_BTN_NAME "DISP"
+#define Q_BTN_NAME (RECORDING ? "INFO" : "[Q]")
+
+#define DISPLAY_STATEOBJ (*(struct state_object **)0x318B8)
+#define DISPLAY_IS_ON (DISPLAY_STATEOBJ->current_state != 0)
+
+#define VIDEO_PARAMETERS_SRC_3 0x6A95C 
+#define FRAME_SHUTTER_TIMER (*(uint16_t*)(VIDEO_PARAMETERS_SRC_3+0xC))
+#define FRAME_ISO (*(uint8_t*)(VIDEO_PARAMETERS_SRC_3+0x8))
+#define FRAME_APERTURE (*(uint8_t*)(VIDEO_PARAMETERS_SRC_3+0x9))
+#define FRAME_SHUTTER (*(uint8_t*)(VIDEO_PARAMETERS_SRC_3+0xa))
+#define FRAME_BV ((int)FRAME_SHUTTER + (int)FRAME_APERTURE - (int)FRAME_ISO)
+
+// see "Malloc Information"
+#define MALLOC_STRUCT_ADDR 0x671A8
+#define MALLOC_FREE_MEMORY (MEM(MALLOC_STRUCT + 8) - MEM(MALLOC_STRUCT + 0x1C)) // "Total Size" - "Allocated Size"
+#define SRM_BUFFER_SIZE 0x1f68000 //0x14E8000   /* print it from srm_malloc_cbr */
+
+// for bulb ramping calibration: delay between two exposure readings (increase it if brightness updates slowly)
+// if not defined, default is 500
+#define BRAMP_CALIBRATION_DELAY 1000
+
+//~ max volume supported for beeps
+#define ASIF_MAX_VOL 5
+
+// temperature convertion from raw-temperature to celsius
+// http://www.magiclantern.fm/forum/index.php?topic=9673.0
+#define EFIC_CELSIUS ((int)efic_temp * 60 / 100 - 65)
+
+// WTF
+#define SRM_MAX_BUF_COUNT_VIDEO_MODE 16
+
+#define DEFAULT_RAW_BUFFER MEM(MEM(0x37930 + 0x30))     /*0xfe1a3d6c how much do we have allocated? */
+#define DEFAULT_RAW_BUFFER_SIZE 8*1024*1024     /* is this really overwritten by other code? needs some investigation */