diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h index d9f91b870..bbae7a5bb 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h @@ -922,7 +922,7 @@ #define HUNTING_MCU_UART ENABLE #define HUNTING_IR_LED_940 ENABLE #define SF_EXIF_MN_BUF_SIZE 256 -#define SF_BASE_VERSION "7MR5RCwDB08" +#define SF_BASE_VERSION "7MR5RCwDB09" #define HW_S530 DISABLE #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ diff --git a/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h b/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h index 768231d66..558b6b7bc 100755 --- a/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h +++ b/code/application/source/sf_app/code/include/sf_commu_mcu_reg.h @@ -356,7 +356,7 @@ unsigned char sf_mcu_wdg_off(void); void sf_set_module_sleep_flag(UINT8 flag); UINT8 sf_get_module_sleep_flag(void); int sf_app_while_flag(void); -void sf_set_sim_insert(UINT32 sim); +void sf_set_sim_insert(INT32 sim); UINT32 sf_get_sim_insert(void); int sf_get_signal_ready(void); int sf_set_signal_ready(int value); diff --git a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c index 4f1ae83c0..8b66623e7 100755 --- a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c +++ b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c @@ -57,7 +57,10 @@ unsigned char POWEROFF = 0; SF_TIME_S sfMcuTime = { 0 }; static BOOL ConfigureModeFlag = 0; /* 0: HTC Mode, 1: Nomal Mode */ //static UINT8 PowerOnMode = 0; //=>PWR_ON_SETUP -static UINT32 simCardInsert=0; +#define SIM_CARD_INSERT 1 +#define SIM_CARD_NOT_INSERT 0 +#define SIM_CARD_DEFAULT_STATUS -1 +static INT32 simCardInsert = SIM_CARD_DEFAULT_STATUS; static UINT8 gModuleSleep = 1; static int isSignalReady = -1; static SINT32 GPRS_ERRNO = 0; @@ -1225,7 +1228,7 @@ int sf_app_while_flag(void) return 0; } } -void sf_set_sim_insert(UINT32 sim) +void sf_set_sim_insert(INT32 sim) { if(simCardInsert != sim) { diff --git a/code/lib/source/sifar/code/include/sf_mcu.h b/code/lib/source/sifar/code/include/sf_mcu.h index 7d3f6d01e..3bbd3516c 100644 --- a/code/lib/source/sifar/code/include/sf_mcu.h +++ b/code/lib/source/sifar/code/include/sf_mcu.h @@ -396,7 +396,7 @@ void sf_set_power_off_flag(UINT8 flag); UINT8 sf_get_power_off_flag(void); int sf_while_flag(void); UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId); -void sf_set_sim_insert(UINT8 sim); +void sf_set_sim_insert(INT32 sim); UINT8 sf_get_mcu_rtc_set_sys(void); unsigned short sf_get_mcu_ver(void); UINT16 sf_mcu_get_irshtter(void); diff --git a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c index d53618fb1..5f6483806 100644 --- a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c +++ b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c @@ -59,7 +59,10 @@ static UINT8 ModuleUpdating = 0; static BOOL ConfigureModeFlag = 0; /* 0: HTC Mode, 1: Nomal Mode */ static UINT8 AeNightMode = 0; /* 0:day 1:night */ //#define printf(fmt, args...) printk(fmt , ## args) -static UINT32 simCardInsert=0; +#define SIM_CARD_INSERT 1 +#define SIM_CARD_NOT_INSERT 0 +#define SIM_CARD_DEFAULT_STATUS -1 +static INT32 simCardInsert = SIM_CARD_DEFAULT_STATUS; static UINT8 gModuleSleep = 1; UINT32 SmsCheck = 0; static UINT8 McuProductInfo = 0; @@ -2027,7 +2030,7 @@ int sf_while_flag(void) } } -void sf_set_sim_insert(UINT8 sim) +void sf_set_sim_insert(INT32 sim) { simCardInsert = sim; }