Changeset 977


Ignore:
Timestamp:
11/16/10 05:30:23 (3 years ago)
Author:
reyalp
Message:

renames and cleanup in preparation for making script optional. From ultimA in ​http://chdk.setepontos.com/index.php?topic=5793.msg57064#msg57064

Location:
trunk
Files:
61 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/conf.c

    r972 r977  
    7070static void conf_change_dng_ext(); 
    7171 
    72 void ubasic_camera_set_raw(int mode) 
     72void camera_set_raw(int mode) 
    7373{ 
    7474    conf.save_raw = mode; 
    7575} 
    7676 
    77 void ubasic_camera_set_nr(int mode) 
     77void camera_set_nr(int mode) 
    7878{ 
    7979        // "Auto", "Off", "On" 
    8080    conf.raw_nr = mode; 
    8181} 
    82 int ubasic_camera_script_autostart() 
     82int camera_get_script_autostart() 
    8383{        
    8484        // 1 = Autostarted 
    … …  
    8686} 
    8787 
    88 void ubasic_camera_set_script_autostart(int state) 
     88void camera_set_script_autostart(int state) 
    8989{        
    9090        // 1 = Autostarted 
    … …  
    9292} 
    9393 
    94 int ubasic_camera_get_nr() 
     94int camera_get_nr() 
    9595{ 
    9696        // "Auto", "Off", "On" 

  • trunk/core/gui_palette.c

    r515 r977  
    55#include "conf.h" 
    66#include "lang.h" 
    7 #include "ubasic.h" 
    87#include "gui.h" 
    98#include "gui_draw.h" 

  • trunk/core/histogram.c

    r929 r977  
    55#include "conf.h" 
    66#include "math.h" 
    7 #include "ubasic.h" 
    87#include "gui.h" 
    98#include "gui_draw.h" 

  • trunk/core/kbd.c

    r959 r977  
    331331 
    332332    if( is_lua() ) { 
    333         if( !lua_script_start(state_ubasic_script) ) { 
     333        if( !lua_script_start(script_source_str) ) { 
    334334            script_print_screen_end(); 
    335335            wait_and_end(); 
    … …  
    346346        state_lua_kbd_first_call_to_resume = 1; 
    347347    } else { // ubasic 
    348         ubasic_init(state_ubasic_script); 
     348        ubasic_init(script_source_str); 
    349349 
    350350        for (i=0; i<SCRIPT_NUM_PARAMS; ++i) { 

  • trunk/core/luascript.c

    r957 r977  
    332332  if( lua_isnumber( L, 3 ) ) 
    333333    to2 = lua_tonumber( L, 3 ); 
    334   ubasic_set_led(to, to1, to2); 
     334  camera_set_led(to, to1, to2); 
    335335  return 0; 
    336336} 
    … …  
    353353static int luaCB_set_raw_nr( lua_State* L ) 
    354354{ 
    355   ubasic_camera_set_nr(luaL_checknumber( L, 1 )); 
     355  camera_set_nr(luaL_checknumber( L, 1 )); 
    356356  return 0; 
    357357} 
    … …  
    359359static int luaCB_get_raw_nr( lua_State* L ) 
    360360{ 
    361   lua_pushnumber( L, ubasic_camera_get_nr() ); 
     361  lua_pushnumber( L, camera_get_nr() ); 
    362362  return 1; 
    363363} 
    … …  
    365365static int luaCB_set_raw( lua_State* L ) 
    366366{ 
    367   ubasic_camera_set_raw(luaL_checknumber( L, 1 )); 
     367  camera_set_raw(luaL_checknumber( L, 1 )); 
    368368  return 0; 
    369369} 
    … …  
    522522static int luaCB_autostarted( lua_State* L ) 
    523523{ 
    524   lua_pushboolean( L, ubasic_camera_script_autostart() ); 
     524  lua_pushboolean( L, camera_get_script_autostart() ); 
    525525  return 1; 
    526526} 

  • trunk/core/script.c

    r899 r977  
    1414 
    1515//------------------------------------------------------------------- 
    16 const char *state_ubasic_script=NULL; //ERR99 
     16const char *script_source_str=NULL; //ERR99 
    1717char cfg_name[100] = "\0"; 
    1818char cfg_set_name[100] = "\0"; 
    … …  
    135135//------------------------------------------------------------------- 
    136136static void script_scan(const char *fn, int update_vars) { 
    137     register const char *ptr = state_ubasic_script; 
     137    register const char *ptr = script_source_str; 
    138138    register int i, j=0, n; 
    139139    char *c; 
    … …  
    336336//    save_params_values(0); 
    337337 
    338     if(state_ubasic_script && state_ubasic_script != ubasic_script_default) 
    339         free((void *)state_ubasic_script); 
    340  
    341     state_ubasic_script = ubasic_script_default; 
     338    if(script_source_str && script_source_str != ubasic_script_default) 
     339        free((void *)script_source_str); 
     340 
     341    script_source_str = ubasic_script_default; 
    342342    update_vars = (strcmp(fn, conf.script_file) != 0) || !saved_params || (saved_params == 2);  // update if new file 
    343343 
    … …  
    381381        if (rcnt > 0){ 
    382382            buf[rcnt] = 0; 
    383             state_ubasic_script = buf; 
     383            script_source_str = buf; 
    384384            strcpy(conf.script_file, fn); 
    385385        } 

  • trunk/include/platform.h

    r957 r977  
    403403long get_vbatt_max(); 
    404404void play_sound(unsigned sound); 
    405 void ubasic_camera_set_raw(int mode); 
    406 void ubasic_camera_set_nr(int mode); 
    407 int ubasic_camera_get_nr(); 
    408 int ubasic_camera_script_autostart(); 
    409 void ubasic_camera_set_script_autostart(); 
     405void camera_set_raw(int mode); 
     406void camera_set_nr(int mode); 
     407int camera_get_nr(); 
     408int camera_get_script_autostart(); 
     409void camera_set_script_autostart(); 
    410410void exit_alt(); 
    411411void camera_shutdown_in_a_second(void);  
    … …  
    421421/******************************************************************/ 
    422422void __attribute__((noreturn)) shutdown(); 
    423 void ubasic_set_led(int led, int state, int bright); 
     423void camera_set_led(int led, int state, int bright); 
    424424void debug_led(int state); 
    425425/****************************************/ 

  • trunk/include/script.h

    r957 r977  
    88 
    99//------------------------------------------------------------------- 
    10 extern const char *state_ubasic_script; 
     10extern const char *script_source_str; 
    1111 
    1212extern char script_title[36]; 

  • trunk/lib/ubasic/camera_functions.c

    r899 r977  
    163163        return 0; 
    164164} 
    165 void ubasic_camera_set_nr(to)  
     165void camera_set_nr(to)  
    166166{ 
    167167        raw_nr = to; 
    … …  
    169169}; 
    170170 
    171 int ubasic_camera_get_nr(to)  
     171int camera_get_nr(to)  
    172172{ 
    173173    printf("*** get raw nr ***\n"); 
    … …  
    175175}; 
    176176 
    177 void ubasic_camera_set_raw(int mode) 
     177void camera_set_raw(int mode) 
    178178{ 
    179179        raw = mode; 
    … …  
    197197        return 4085; 
    198198} 
    199 void ubasic_set_led(int led, int state, int bright) 
     199void camera_set_led(int led, int state, int bright) 
    200200{ 
    201201    printf("*** set led %d %d %d ***\n",led, state, bright); 
    … …  
    210210        return 0; 
    211211} 
    212 int ubasic_camera_script_autostart() 
    213 { 
    214         return 0; 
    215 } 
    216 void ubasic_camera_set_script_autostart(int state) 
     212int camera_get_script_autostart() 
     213{ 
     214        return 0; 
     215} 
     216void camera_set_script_autostart(int state) 
    217217{ 
    218218        autostart = state; 

  • trunk/lib/ubasic/camera_functions.h

    r515 r977  
    1111int md_get_cell_diff(int column, int row); 
    1212int md_init_motion_detector(); 
    13 void ubasic_camera_set_raw(int mode); 
     13void camera_set_raw(int mode); 
    1414void ubasic_camera_get_raw(); 
    15 void ubasic_camera_set_nr(int to); 
    16 int ubasic_camera_get_nr(); 
     15void camera_set_nr(int to); 
     16int camera_get_nr(); 
    1717void shooting_set_prop(int id, int v); 
    1818int shooting_get_prop(int id); 
    1919long stat_get_vbatt(); 
    20 void ubasic_set_led(int led, int state, int bright); 
     20void camera_set_led(int led, int state, int bright); 
    2121int shooting_get_day_seconds(); 
    2222int shooting_get_tick_count(); 
    2323int ubasic_camera_script_autostart(); 
    2424int get_usb_power(int edge); 
    25 void ubasic_camera_set_script_autostart(int state); 
     25void camera_set_script_autostart(int state); 
    2626void exit_alt(); 
    2727//#include "../../core/motion_detector.h" 

  • trunk/lib/ubasic/ubasic.c

    r944 r977  
    244244 case TOKENIZER_GET_RAW_NR: 
    245245    accept(TOKENIZER_GET_RAW_NR); 
    246     r = ubasic_camera_get_nr();      
     246    r = camera_get_nr();      
    247247    break; 
    248248 case TOKENIZER_IS_KEY: 
    … …  
    254254case TOKENIZER_SCRIPT_AUTOSTARTED: 
    255255    accept(TOKENIZER_SCRIPT_AUTOSTARTED); 
    256     r = ubasic_camera_script_autostart(); 
     256    r = camera_get_script_autostart(); 
    257257    break; 
    258258case TOKENIZER_GET_SCRIPT_AUTOSTART: 
    … …  
    19651965                to2 = expr(); 
    19661966    } 
    1967         ubasic_set_led(to, to1, to2); 
     1967        camera_set_led(to, to1, to2); 
    19681968    accept_cr(); 
    19691969} 
    … …  
    20272027    accept(TOKENIZER_SET_RAW); 
    20282028    to = expr(); 
    2029     ubasic_camera_set_raw(to); 
     2029    camera_set_raw(to); 
    20302030    accept_cr(); 
    20312031} 
    … …  
    20352035    accept(TOKENIZER_SET_RAW_NR); 
    20362036    to = expr(); 
    2037     ubasic_camera_set_nr(to); 
     2037    camera_set_nr(to); 
    20382038    accept_cr(); 
    20392039} 

  • trunk/platform/a2000/lib.c

    r797 r977  
    5656} 
    5757 
    58 void ubasic_set_led(int led, int state, int bright) {  
     58void camera_set_led(int led, int state, int bright) {  
    5959        struct led_control led_c;  
    6060        char convert_table[11]={0,1,2,3,0,2,3,1,8,10,10};  // s3 to a710 (and a720) convert table 

  • trunk/platform/a470/wrappers.c

    r842 r977  
    1919 
    2020 
    21 void ubasic_set_led(int led, int state, int bright) 
     21void camera_set_led(int led, int state, int bright) 
    2222{  
    2323        struct led_control led_c;  

  • trunk/platform/a480/lib.c

    r885 r977  
    3636} 
    3737 
    38 void ubasic_set_led(int led, int state, int bright) { 
     38void camera_set_led(int led, int state, int bright) { 
    3939 static char led_table[]={7,9}; 
    4040 _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/a530/lib.c

    r515 r977  
    3737#define LED_BASE 0xc0220080 
    3838 
    39 void ubasic_set_led(int led, int state, int bright) 
     39void camera_set_led(int led, int state, int bright) 
    4040 
    4141{ 

  • trunk/platform/a560/lib.c

    r515 r977  
    3636#define LED_BASE 0xc02200C0 
    3737 
    38 void ubasic_set_led(int led, int state, int bright) 
     38void camera_set_led(int led, int state, int bright) 
    3939 
    4040{ 

  • trunk/platform/a570/lib.c

    r515 r977  
    3636#define LED_BASE 0xc02200C0 
    3737 
    38 void ubasic_set_led(int led, int state, int bright) 
     38void camera_set_led(int led, int state, int bright) 
    3939 
    4040{ 

  • trunk/platform/a590/wrappers.c

    r842 r977  
    1818 
    1919 
    20 void ubasic_set_led(int led, int state, int bright) 
     20void camera_set_led(int led, int state, int bright) 
    2121{ 
    2222        // 0 gr   

  • trunk/platform/a650/lib.c

    r515 r977  
    3131#define LED_AF 0xc0220080 
    3232 
    33 void ubasic_set_led(int led, int state, int bright) 
     33void camera_set_led(int led, int state, int bright) 
    3434 
    3535{ 

  • trunk/platform/a700/wrappers.c

    r842 r977  
    1717 
    1818// copied from a710 
    19 void ubasic_set_led(int led, int state, int bright) 
     19void camera_set_led(int led, int state, int bright) 
    2020{ 
    2121 struct led_control led_c; 

  • trunk/platform/a710/wrappers.c

    r842 r977  
    1616} 
    1717 
    18 void ubasic_set_led(int led, int state, int bright) 
     18void camera_set_led(int led, int state, int bright) 
    1919{ 
    2020 struct led_control led_c; 

  • trunk/platform/a720/wrappers.c

    r842 r977  
    1818 
    1919 
    20 void ubasic_set_led(int led, int state, int bright) 
     20void camera_set_led(int led, int state, int bright) 
    2121{  
    2222        struct led_control led_c;  

  • trunk/platform/d10/lib.c

    r897 r977  
    4141 
    4242// TODO 
    43 void ubasic_set_led(int led, int state, int bright) { 
     43void camera_set_led(int led, int state, int bright) { 
    4444} 
    4545 

  • trunk/platform/g11/lib.c

    r871 r977  
    3030} 
    3131 
    32 void ubasic_set_led(int led, int state, int bright) { 
     32void camera_set_led(int led, int state, int bright) { 
    3333        static char led_table[7]={0,1,2,3,9,14,15}; 
    3434    _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/g7/lib.c

    r547 r977  
    3030#define LED_BASE 0xc0220000 
    3131 
    32 void ubasic_set_led(int led, int state, int bright) 
     32void camera_set_led(int led, int state, int bright) 
    3333 
    3434{ 

  • trunk/platform/g9/lib.c

    r576 r977  
    3333#define LED_AF 0xC0220094//was 0xc0220080 //a650- 0xc0220080//from g7 
    3434 
    35 void ubasic_set_led1(int led, int state, int bright)//? 
     35void camera_set_led1(int led, int state, int bright)//? 
    3636{ 
    3737  int leds[] = {12,16,4,8,4,0,4}; 

  • trunk/platform/g9/wrappers.c

    r842 r977  
    1717 
    1818 
    19 void ubasic_set_led(int led, int state, int bright) 
     19void camera_set_led(int led, int state, int bright) 
    2020{  
    2121        struct led_control led_c;  

  • trunk/platform/generic/lib.c

    r547 r977  
    3030#define LED_AF 0xc0220080 
    3131 
    32 void __attribute__((weak)) ubasic_set_led(int led, int state, int bright) 
     32void __attribute__((weak)) camera_set_led(int led, int state, int bright) 
    3333 
    3434{ 

  • trunk/platform/ixus100_sd780/lib.c

    r876 r977  
    4141 
    4242// based on SX10, values found by experiment 
    43 void ubasic_set_led(int led, int state, int bright) { 
     43void camera_set_led(int led, int state, int bright) { 
    4444 static char led_table[]={0, // green 
    4545                          1, // orange, right 

  • trunk/platform/ixus40_sd300/lib.c

    r515 r977  
    256256        led_off(led); 
    257257} 
    258 void ubasic_set_led(int led, int state, int bright) 
     258void camera_set_led(int led, int state, int bright) 
    259259{ 
    260260        if (state) { 

  • trunk/platform/ixus50_sd400/lib.c

    r515 r977  
    6565        led_off(led); 
    6666} 
    67 void ubasic_set_led(int led, int state, int bright) 
     67void camera_set_led(int led, int state, int bright) 
    6868{ 
    6969        if (state) { 

  • trunk/platform/ixus55_sd450/lib.c

    r515 r977  
    3131#define LED_BASE 0xc02200dc 
    3232 
    33 void ubasic_set_led(int led, int state, int bright) 
     33void camera_set_led(int led, int state, int bright) 
    3434 
    3535{ 

  • trunk/platform/ixus700_sd500/lib.c

    r515 r977  
    6464        led_off(led); 
    6565} 
    66 void ubasic_set_led(int led, int state, int bright) 
     66void camera_set_led(int led, int state, int bright) 
    6767{ 
    6868        if (state) { 

  • trunk/platform/ixus70_sd1000/lib.c

    r515 r977  
    4343#define LED_BASE 0xC02200C0 
    4444 
    45 void ubasic_set_led(int led, int state, int bright) 
     45void camera_set_led(int led, int state, int bright) 
    4646 
    4747{ 

  • trunk/platform/ixus750_sd550/lib.c

    r515 r977  
    3131#define LED_BASE 0xc02200dc 
    3232 
    33 void ubasic_set_led(int led, int state, int bright) 
     33void camera_set_led(int led, int state, int bright) 
    3434 
    3535{ 

  • trunk/platform/ixus75_sd750/lib.c

    r560 r977  
    4343#define LED_BASE 0xC02200C0 
    4444 
    45 void ubasic_set_led(int led, int state, int bright) 
     45void camera_set_led(int led, int state, int bright) 
    4646 
    4747{ 

  • trunk/platform/ixus800_sd700/lib.c

    r515 r977  
    3232} 
    3333 
    34 void ubasic_set_led(int led, int state, int bright) 
     34void camera_set_led(int led, int state, int bright) 
    3535{ 
    3636        debug_led(state); 

  • trunk/platform/ixus80_sd1100/lib.c

    r569 r977  
    2929 
    3030 
    31 void ubasic_set_led(int led, int state, int bright) 
     31void camera_set_led(int led, int state, int bright) 
    3232{ 
    3333/* ??? 

  • trunk/platform/ixus850_sd800/lib.c

    r515 r977  
    4242#define LED_BASE 0xC02200C0 
    4343 
    44 void ubasic_set_led(int led, int state, int bright) 
     44void camera_set_led(int led, int state, int bright) 
    4545{ 
    4646  int leds[] = {12,16,4,8,4,0,4}; 

  • trunk/platform/ixus85_sd770/lib.c

    r901 r977  
    2828} 
    2929 
    30 void ubasic_set_led(int led, int state, int bright) 
     30void camera_set_led(int led, int state, int bright) 
    3131{ 
    3232        static char led_table[5]={4,5,7,8,9}; 

  • trunk/platform/ixus860_sd870/lib.c

    r515 r977  
    3434 
    3535//  fe50 10-Aug-2008 
    36 void ubasic_set_led(int led, int state, int bright) 
     36void camera_set_led(int led, int state, int bright) 
    3737{ 
    3838        // "brigth" not implemented 

  • trunk/platform/ixus870_sd880/lib.c

    r957 r977  
    4646} 
    4747 
    48 void ubasic_set_led(int led, int state, int bright) { 
     48void camera_set_led(int led, int state, int bright) { 
    4949  // approximation of behaviour advertised in documentation. 
    5050  long val = state ? 0x46 : 0x44; 

  • trunk/platform/ixus900_sd900/lib.c

    r974 r977  
    4141#define LED_BASE  0xC02200C0   // led base address 
    4242 
    43 void ubasic_set_led(int led, int state, int bright) { 
     43void camera_set_led(int led, int state, int bright) { 
    4444    int leds[] = {12,16,4,8,4,0,4}; 
    4545    if(led < 4 || led > 10 || led == 6) return; 

  • trunk/platform/ixus90_sd790/lib.c

    r868 r977  
    4747 
    4848//  fe50 10-Aug-2008 
    49 void ubasic_set_led(int led, int state, int bright) 
     49void camera_set_led(int led, int state, int bright) 
    5050{ 
    5151        // "brigth" not implemented 
    … …  
    6161} 
    6262 
    63 //void ubasic_set_led(int led, int state, int bright) 
     63//void camera_set_led(int led, int state, int bright) 
    6464//{ 
    6565//      static char led_table[5]={4,5,7,8,9}; 

  • trunk/platform/ixus950_sd850/lib.c

    r515 r977  
    4242#define LED_BASE 0xC02200C0 
    4343 
    44 void ubasic_set_led(int led, int state, int bright) 
     44void camera_set_led(int led, int state, int bright) 
    4545 
    4646{ 

  • trunk/platform/ixus95_sd1200/lib.c

    r953 r977  
    3333// from  Microfunguy in 
    3434// http://chdk.setepontos.com/index.php/topic,4324.msg55475.html#msg55475 
    35 void ubasic_set_led(int led, int state, int bright) 
     35void camera_set_led(int led, int state, int bright) 
    3636{ 
    3737   int leds[] = {0x134,0x138,0x134,0x130,0x134,0x3030,0x3030};  //  green=4 | (yellow) | (not used) | orange | (not used) | af beam | timer 

  • trunk/platform/ixus95_sd1200/sub/100c/boot.c

    r950 r977  
    543543                    led=(void *)ledlist[(i_led)%4]; 
    544544                    //led=(void *)ledlist[(++i_led)%4]; 
    545                     //ubasic_set_led(i_led % 6, ledstate, 0); 
     545                    //camera_set_led(i_led % 6, ledstate, 0); 
    546546                    //core_test(1); 
    547547            } else { 
    548548                    ledstate = 1; 
    549                     //ubasic_set_led(i_led % 6, ledstate, 0); 
     549                    //camera_set_led(i_led % 6, ledstate, 0); 
    550550                    *led = 0x46;      // LED on 
    551551                    //core_test(0); 

  • trunk/platform/ixus960_sd950/lib.c

    r515 r977  
    2424} 
    2525#define LED_AF 0xc0223030 
    26 void ubasic_set_led(int led, int state, int bright) 
     26void camera_set_led(int led, int state, int bright) 
    2727{ 
    2828int leds[] = {106,0,0,103,0,3940,0}; 

  • trunk/platform/ixus970_sd890/lib.c

    r730 r977  
    2828} 
    2929 
    30 void ubasic_set_led(int led, int state, int bright) 
     30void camera_set_led(int led, int state, int bright) 
    3131{ 
    3232        static char led_table[5]={4,5,7,8,9}; 

  • trunk/platform/ixus980_sd990/lib.c

    r747 r977  
    4141 
    4242// based on SX10, values found by experiment 
    43 void ubasic_set_led(int led, int state, int bright) { 
     43void camera_set_led(int led, int state, int bright) { 
    4444 static char led_table[]={0, // green 
    4545                          1, // orange, right 

  • trunk/platform/s2is/lib.c

    r515 r977  
    5757} 
    5858 
    59 void ubasic_set_led(int led, int state, int bright) 
     59void camera_set_led(int led, int state, int bright) 
    6060{ 
    6161        if (state) { 

  • trunk/platform/s3is/lib.c

    r515 r977  
    5858 
    5959 
    60 void ubasic_set_led(int led, int state, int bright) 
     60void camera_set_led(int led, int state, int bright) 
    6161{ 
    6262        if (state) { 

  • trunk/platform/s5is/lib.c

    r515 r977  
    6464} 
    6565 
    66 void ubasic_set_led(int led, int state, int bright) 
     66void camera_set_led(int led, int state, int bright) 
    6767{ 
    6868        if (state) { 

  • trunk/platform/s90/lib.c

    r888 r977  
    3030} 
    3131 
    32 void ubasic_set_led(int led, int state, int bright) { 
     32void camera_set_led(int led, int state, int bright) { 
    3333        static char led_table[4]={0,1,9,10}; 
    3434    _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/sx1/lib.c

    r816 r977  
    3434} 
    3535 
    36 void ubasic_set_led(int led, int state, int bright) { 
     36void camera_set_led(int led, int state, int bright) { 
    3737 static char led_table[5]={4,5,7,8,9}; 
    3838 _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/sx10/lib.c

    r825 r977  
    3333} 
    3434 
    35 void ubasic_set_led(int led, int state, int bright) { 
     35void camera_set_led(int led, int state, int bright) { 
    3636 static char led_table[5]={4,5,7,8,9}; 
    3737 _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/sx100is/wrappers.c

    r842 r977  
    1818 
    1919 
    20 void ubasic_set_led(int led, int state, int bright) 
     20void camera_set_led(int led, int state, int bright) 
    2121{  
    2222        struct led_control led_c;  

  • trunk/platform/sx110is/lib.c

    r822 r977  
    4848} 
    4949 
    50 void ubasic_set_led(int led, int state, int bright) { 
     50void camera_set_led(int led, int state, int bright) { 
    5151 static char led_table[5]={4,5,7,8,9}; 
    5252 _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/sx20/lib.c

    r939 r977  
    4545} 
    4646 
    47 void ubasic_set_led(int led, int state, int bright) { 
     47void camera_set_led(int led, int state, int bright) { 
    4848 static char led_table[5]={4,5,7,8,9}; 
    4949 _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/sx200is/lib.c

    r804 r977  
    3333} 
    3434 
    35 void ubasic_set_led(int led, int state, int bright) { 
     35void camera_set_led(int led, int state, int bright) { 
    3636 static char led_table[5]={4,5,7,8,9}; 
    3737 _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state); 

  • trunk/platform/tx1/lib.c

    r515 r977  
    6767 
    6868} 
    69 void ubasic_set_led(int led, int state, int bright) 
     69void camera_set_led(int led, int state, int bright) 
    7070{ 
    7171        if (state) { 
Note: See TracChangeset for help on using the changeset viewer.