Read about our upcoming Code of Conduct on this issue

Commit 38f1abef authored by hudson@andromeda.local's avatar hudson@andromeda.local
Browse files

Lens and focus info works, too

--HG--
branch : 550d
parent d5221f0015e9
......@@ -158,24 +158,26 @@ ML_OBJS-y = \
5d-hack.o \
stubs-550d.108.o \
version.o \
NO=\
stdio.o \
config.o \
debug.o \
menu.o \
property.o \
bmp.o \
font-huge.o \
font-large.o \
font-med.o \
font-small.o \
config.o \
menu.o \
stdio.o \
audio.o \
lens.o \
property.o \
NO2=\
zebra.o \
gui.o \
NO=\
debug.o \
focus.o \
lens.o \
spotmeter.o \
audio.o \
zebra.o \
hotplug.o \
bootflags.o \
ptp.o \
......
......@@ -585,8 +585,6 @@ audio_configure( int force )
}
#ifdef CONFIG_MENUS
/** Menu handlers */
static void
......@@ -781,7 +779,6 @@ static struct menu_entry audio_menus[] = {
},
#endif
};
#endif // CONFIG_MENU
......@@ -856,10 +853,8 @@ my_sounddev_task( void )
sounddev_active_in(0,0);
#ifdef CONFIG_MENU
// Create the menu items
menu_add( "Audio", audio_menus, COUNT(audio_menus) );
#endif
audio_configure( 1 ); // force it this time
#ifdef CONFIG_AUDIO_REG_LOG
......
......@@ -55,7 +55,7 @@ struct gui_timer_struct
extern struct gui_timer_struct gui_timer_struct;
#if 0
// Replaces the gui_main_task
static void
my_gui_main_task( void )
......@@ -219,3 +219,4 @@ queue_clear:
}
TASK_OVERRIDE( gui_main_task, my_gui_main_task );
#endif // early port
......@@ -33,7 +33,7 @@
static struct semaphore * menu_sem;
extern struct semaphore * gui_sem;
static struct semaphore * gui_sem;
static int menu_damage;
static int menu_hidden;
static int menu_timeout;
......
......@@ -85,6 +85,9 @@ NSTUB( 0xFF056E38, prop_request_change )
NSTUB( 0xFF057418, prop_deliver ) // maybe?
NSTUB( 0xFF1C924C, dispcheck )
NSTUB( 0x2E5BC, bmp_vram_info )
NSTUB( 0x8194C, vram_info )
NSTUB( 0xFF28A6F8, vram_get_number )
NSTUB( 0xFF018270, malloc )
NSTUB( 0xFF0182cc, free )
......@@ -94,27 +97,32 @@ NSTUB( 0xFF1EC1CC, strcpy )
NSTUB( 0xFF06366C, LoadCalendarFromRTC )
NSTUB( 0xFF0771BC, task_trampoline )
NSTUB( 0xFF0575C0, prop_cleanup )
NSTUB( 0xFF063BF4, _audio_ic_write )
NSTUB( 0xFF063AA8, _audio_ic_read )
NSTUB( 0xFF05346C, sounddev_task )
NSTUB( 0xFF0537D4, sounddev_active_in )
NSTUB( 0xFF4C463C, audio_thresholds )
NSTUB( 0x1ED0, sounddev )
NSTUB( 0xFF069D10, create_named_semaphore )
NSTUB( 0xFF2B4C10, gui_task_create )
NSTUB( 0xFF2B4D30, gui_task_destroy )
NSTUB( 0xFF2B4AC0, ctrlman_dispatch_event )
NSTUB( 0xFF44F7CC, memcpy )
#if 0
//NSTUB( 0xFF85F1A8, prop_cleanup )
NSTUB( 0xFF86DC0C, create_named_semaphore )
NSTUB( 0xFFA6BD14, gui_task_create )
NSTUB( 0xFF812E44, cli_save )
NSTUB( 0xFF812E58, sei_restore )
NSTUB( 0xFF85961C, _audio_ic_write )
NSTUB( 0xFF85944C, _audio_ic_read )
NSTUB( 0xFF85B0C8, sounddev_task )
NSTUB( 0x2360, sounddev )
NSTUB( 0xFFA0FD18, ptp_register_handler )
NSTUB( 0xFF92EA48, gui_lock )
NSTUB( 0xFF893CD8, prop_request_icu_auto_poweroff )
NSTUB( 0xFFC455CC, memcpy )
NSTUB( 0xFF86C704, oneshot_timer )
NSTUB( 0xFF81DE08, hotplug_task )
NSTUB( 0x1AA4, hotplug_struct )
NSTUB( 0x1AD8, hotplug_usb_buf )
NSTUB( 0x27624, bmp_vram_info )
NSTUB( 0x38920, vram_info )
NSTUB( 0xFFA413FC, vram_get_number )
NSTUB( 0x208A4, cf_device )
NSTUB( 0xFFA6BE34, gui_task_destroy )
NSTUB( 0xFF82399C, gui_main_task )
......@@ -129,11 +137,8 @@ NSTUB( 0xFF8921F0, gui_post_10000085 )
NSTUB( 0xFF892830, gui_init_event )
NSTUB( 0xFF8922A4, gui_change_shoot_type_post )
NSTUB( 0xFF89233C, gui_change_lcd_state_post )
NSTUB( 0xFFA6BBC4, ctrlman_dispatch_event )
NSTUB( 0xFF890188, gui_massive_event_loop )
NSTUB( 0xFF9B3910, gui_timer_something )
NSTUB( 0xFFCB48CC, audio_thresholds )
NSTUB( 0xFF85B438, sounddev_active_in )
NSTUB( 0xFF9B9FD0, alloc_dma_memory )
NSTUB( 0xFF9BA004, free_dma_memory )
#endif
......@@ -686,6 +686,7 @@ zebra_task( void )
);
}
#ifndef CONFIG_550D
if( enable_liveview )
{
/*
......@@ -699,6 +700,7 @@ zebra_task( void )
// Clear the bitmap display, just in case
bmp_fill( 0, 0, 0, 720, 480 );
}
#endif
menu_add( "Video", zebra_menus, COUNT(zebra_menus) );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment