OneDeuxTriSeiGo
commented
6 months ago -
[ ]
apps/common/app_thread.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/apps/common/app_thread.h bes/apps/common/app_thread.h index f06729d49b4..c019af10b7c 100644 --- a/apps/common/app_thread.h +++ b/apps/common/app_thread.h @@ -19,7 +19,7 @@ extern "C" { #endif -#define APP_MAILBOX_MAX (50) +#define APP_MAILBOX_MAX (20) enum APP_MODUAL_ID_T { APP_MODUAL_KEY = 0, @@ -45,7 +45,9 @@ enum APP_MODUAL_ID_T { #ifdef VOICE_DETECTOR_EN APP_MODUAL_VOICE_DETECTOR, #endif + APP_MODUAL_CUSTOM_FUNCTION, APP_MODUAL_OHTER, + APP_MODUAL_WNR, APP_MODUAL_NUM }; -
-
[ ]
apps/common/app_utils.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/apps/common/app_utils.h bes/apps/common/app_utils.h index cffd1348d1b..531b86e83e0 100644 --- a/apps/common/app_utils.h +++ b/apps/common/app_utils.h @@ -31,10 +31,13 @@ extern "C" { #define APP_SYSFREQ_USER_OTA APP_SYSFREQ_USER_APP_7 #define APP_SYSFREQ_USER_PROMPT_MIXER APP_SYSFREQ_USER_APP_8 #define APP_SYSFREQ_USER_APP_NT APP_SYSFREQ_USER_APP_9 -#define APP_SYSFREQ_USER_VOICE_ASSIST APP_SYSFREQ_USER_APP_10 -#define APP_SYSFREQ_USER_TRIGGER APP_SYSFREQ_USER_APP_11 -#define APP_SYSFREQ_USER_BIS APP_SYSFREQ_USER_APP_12 -#define APP_SYSFREQ_USER_TOTA APP_SYSFREQ_USER_APP_13 +#define APP_SYSFREQ_USER_ANC_WNR APP_SYSFREQ_USER_APP_10 +#ifdef __RAND_FROM_MIC__ +#define APP_SYSFREQ_USER_RANDOM APP_SYSFREQ_USER_APP_11 +#endif +#ifdef __DUAL_MIC_RECORDING__ +#define APP_SYSFREQ_USER_RECORDING APP_SYSFREQ_USER_APP_12 +#endif /* * Pseudo user, if one of user is belong to qos(quality of service) user, * when request cpu freq, it will changed to this user @@ -91,6 +94,12 @@ enum APP_WDT_THREAD_CHECK_USER_T { int app_sysfreq_req(enum APP_SYSFREQ_USER_T user, enum APP_SYSFREQ_FREQ_T freq); +int app_wdt_open(int seconds); + +int app_wdt_reopen(int seconds); + +int app_wdt_close(void); + #ifdef __cplusplus } #endif -
-
[ ]
apps/key/app_key.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/apps/key/app_key.h bes/apps/key/app_key.h index cf654bf04c1..693aded5c5c 100644 --- a/apps/key/app_key.h +++ b/apps/key/app_key.h @@ -59,6 +59,11 @@ enum APP_KEY_EVENT_T { APP_KEY_EVENT_TRIPLECLICK = HAL_KEY_EVENT_TRIPLECLICK, APP_KEY_EVENT_ULTRACLICK = HAL_KEY_EVENT_ULTRACLICK, APP_KEY_EVENT_RAMPAGECLICK = HAL_KEY_EVENT_RAMPAGECLICK, + APP_KEY_EVENT_SIXTHCLICK = HAL_KEY_EVENT_SIXTHCLICK, + APP_KEY_EVENT_SEVENTHCLICK = HAL_KEY_EVENT_SEVENTHCLICK, + APP_KEY_EVENT_EIGHTHCLICK = HAL_KEY_EVENT_EIGHTHCLICK, + APP_KEY_EVENT_NINETHCLICK = HAL_KEY_EVENT_NINETHCLICK, + APP_KEY_EVENT_TENTHCLICK = HAL_KEY_EVENT_TENTHCLICK, APP_KEY_EVENT_REPEAT = HAL_KEY_EVENT_REPEAT, APP_KEY_EVENT_GROUPKEY_DOWN = HAL_KEY_EVENT_GROUPKEY_DOWN, APP_KEY_EVENT_GROUPKEY_REPEAT = HAL_KEY_EVENT_GROUPKEY_REPEAT, @@ -97,6 +102,7 @@ void app_key_handle_clear(void); void app_key_simulate_key_event(uint32_t key_code, uint8_t key_event); +#if defined(_AUTO_TEST_) int simul_key_event_process(uint32_t key_code, uint8_t key_event); #endif #endif//__FMDEC_H__ -
-
[ ]
apps/main/apps.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/apps/main/apps.h bes/apps/main/apps.h index 43225346564..1755c06b75e 100644 --- a/apps/main/apps.h +++ b/apps/main/apps.h @@ -26,7 +26,7 @@ extern "C" { #include "plat_types.h" -int app_init(int only_init); +int app_init(void); int app_deinit(int deinit_case); @@ -66,6 +66,23 @@ bool app_is_power_off_in_progress(void); void app_disconnect_all_bt_connections(void); bool app_is_stack_ready(void); +extern uint8_t latency_mode_is_open; +bool Curr_Is_Master(void); +bool Curr_Is_Slave(void); +extern uint8_t get_nv_role(void); +extern uint8_t get_curr_role(void); +extern uint8_t app_poweroff_flag; +extern bool MobileLinkLose_reboot; +extern bool factory_mode_status; +extern uint8_t app_poweroff_flag; +extern bool MobileLinkLose_reboot; +extern void startclr_info_timer(int ms); +extern void app_enterpairing_timer_start(void); +extern void app_enterpairing_timer_stop(void); +extern void startdelay_report_tone(int ms,APP_STATUS_INDICATION_T status); +extern void box_cmd_app_bt_enter_mono_pairing_mode(void); +extern int app_nvrecord_rebuild(void); +extern void app_bt_power_off_customize(); //////////////////// -
-
[ ]
apps/main/app_status_ind.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/apps/main/app_status_ind.h bes/apps/main/app_status_ind.h index 4f9ac64d91b..4586fa3a39b 100644 --- a/apps/main/app_status_ind.h +++ b/apps/main/app_status_ind.h @@ -56,6 +56,8 @@ typedef enum APP_STATUS_INDICATION_T { APP_STATUS_INDICATION_MUTE, APP_STATUS_INDICATION_TESTMODE, APP_STATUS_INDICATION_TESTMODE1, + APP_STATUS_INDICATION_DU, + APP_STATUS_INDICATION_DUDU, APP_STATUS_RING_WARNING, #ifdef __INTERACTION__ APP_STATUS_INDICATION_FINDME, -
-
[ ]
Makefile-
No Declared License in SDK version.
-
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/Makefile bes/Makefile index e6c10d60473..f9449e0345f 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,7 @@ endif # ifneq ($(KBUILD_OUTPUT),) endif # ifeq ($(KBUILD_SRC),) # We process the rest of the Makefile if this is the final invocation of make -ifneq ($(skip-makefile),1) +ifeq ($(skip-makefile),) # Do not print "Entering directory ...", # but we want to display it when entering to the output directory @@ -428,7 +428,7 @@ KBUILD_CFLAGS += -g #C_ONLY_FLAGS := -std=gnu89 C_ONLY_FLAGS := -std=gnu99 -C++_ONLY_FLAGS := -std=gnu++14 -fno-rtti +C++_ONLY_FLAGS := -std=gnu++98 -fno-rtti KBUILD_AFLAGS := -D__ASSEMBLY__ @@ -472,7 +472,6 @@ else LDFLAGS_IMAGE := -X --no-wchar-size-warning endif -include $(srctree)/scripts/include.mk # Include target definitions include $(srctree)/$(TARGET_CFG_FILE) include $(srctree)/$(TARGET_COMMON_FILE) @@ -549,6 +548,7 @@ REVISION_INFO := $(GIT_REVISION):$(CUST_TGT_INFO) endif endif +include $(srctree)/scripts/include.mk REVISION_INFO := $(subst $(space),-,$(strip $(REVISION_INFO))) SOFTWARE_VERSION := $(subst $(space),-,$(strip $(SOFTWARE_VERSION))) @@ -605,8 +605,8 @@ ifeq ($(LST_SECTION_OPTS),) IMAGE_LST := $(addsuffix .lst,$(basename $(IMAGE_FILE))) else IMAGE_LST := $(addsuffix $(LST_SECTION_NAME).lst,$(basename $(IMAGE_FILE))) +IMAGE_SEC := $(addsuffix $(LST_SECTION_NAME)$(suffix $(IMAGE_FILE)),$(basename $(IMAGE_FILE))) endif -append_lst_sec_name = $(addsuffix $(LST_SECTION_NAME)$(suffix $(1)),$(basename $(1))) LDS_TARGET := _$(notdir $(REAL_LDS_FILE)) @@ -650,7 +650,7 @@ else cmd_gen-STR_BIN = $(OBJCOPY) -j .code_start_addr -j .rodata_str -j .trc_str \ --change-section-lma .code_start_addr=0x00000000 \ --change-section-lma .rodata_str=0x00000010 \ - --change-section-lma .trc_str=0x00030000 \ + --change-section-lma .trc_str=0x00008000 \ -O binary $< $@ endif quiet_cmd_gen-STR_BIN = GENBIN $@ @@ -687,7 +687,7 @@ else ifeq ($(LST_SECTION_OPTS),) cmd_gen-IMAGE_LST = $(OBJDUMP) -Sldx $< > $@ else - cmd_gen-IMAGE_LST = $(OBJCOPY) $(LST_SECTION_OPTS) $< $(call append_lst_sec_name,$<) && $(OBJDUMP) -Sldx $(call append_lst_sec_name,$<) > $@ + cmd_gen-IMAGE_LST = $(OBJCOPY) $(LST_SECTION_OPTS) $< $(IMAGE_SEC) && $(OBJDUMP) -Sldx $(IMAGE_SEC) > $@ endif endif quiet_cmd_gen-IMAGE_LST = GENLST $@ @@ -724,7 +724,8 @@ KBUILD_CFLAGS += $(call cc-option,-Wlogical-op) #KBUILD_CFLAGS += -Wno-address-of-packed-member KBUILD_CFLAGS += -Wno-trigraphs \ - -fno-strict-aliasing + -fno-strict-aliasing \ + -Wno-format-security #KBUILD_CFLAGS += Wundef @@ -788,7 +789,7 @@ endif ifneq ($(SOFTWARE_VERSION),) BUILD_INFO_FLAGS += -DSOFTWARE_VERSION=$(SOFTWARE_VERSION) endif -ifneq ($(OTA_BOOT_SIZE),) +ifneq ($(OTA_BOOT_SIZE),0) BUILD_INFO_FLAGS += -DOTA_BOOT_SIZE=$(OTA_BOOT_SIZE) endif ifneq ($(OTA_CODE_OFFSET),) @@ -996,7 +997,7 @@ endif HELP_TARGET := 2 -endif # ifneq ($(skip-makefile),1) +endif # ifeq ($(skip-makefile),) endif # ifneq ($(HELP_TARGET),1) # Help target -
-
[ ]
platform/cmsis/inc/link_sym_armclang.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/cmsis/inc/link_sym_armclang.h bes/platform/cmsis/inc/link_sym_armclang.h index 6329d0236b5..5a35d8eb65a 100644 --- a/platform/cmsis/inc/link_sym_armclang.h +++ b/platform/cmsis/inc/link_sym_armclang.h @@ -23,7 +23,7 @@ extern "C" { #include "plat_addr_map.h" -#if defined(ROM_BUILD) && !defined(ROM_IN_FLASH) +#ifdef ROM_BUILD #define __rom_got_info_start Image$$rom_got_info$$Base #define __audio_const_rom_start Image$$rom_audio_const$$Base @@ -217,6 +217,8 @@ extern "C" { #define __aud_end Image$$audio$$ZI$$Limit #define __reserved_start Image$$reserved$$Base #define __reserved_end Image$$reserved$$ZI$$Limit +#define __hotword_model_start Image$$hotword_model$$Base +#define __hotword_model_end Image$$hotword_model$$ZI$$Limit #define __factory_start Image$$factory$$Base #define __factory_end Image$$factory$$ZI$$Limit -
-
[ ]
platform/cmsis/inc/mpu.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/cmsis/inc/mpu.h bes/platform/cmsis/inc/mpu.h index 1ce082a4a32..d1938728614 100644 --- a/platform/cmsis/inc/mpu.h +++ b/platform/cmsis/inc/mpu.h @@ -38,6 +38,8 @@ enum MPU_ID_T { #define MPU_ID_USER_DATA_SECTION MPU_ID_1 #define MPU_ID_FRAM_TEXT1 MPU_ID_2 #define MPU_ID_FRAM_TEXT2 MPU_ID_3 +#define MPU_ID_CODE MPU_ID_4 +#define MPU_ID_SRAM_TEXT MPU_ID_5 /*cp sections */ #define MPU_ID_CP_FLASHX MPU_ID_2 @@ -60,9 +62,9 @@ enum MPU_ATTR_T { enum MAIR_ATTR_TYPE_T { MAIR_ATTR_FLASH, MAIR_ATTR_INT_SRAM, - MAIR_ATTR_EXT_RAM, + MAIR_ATTR_EXT_SRAM, MAIR_ATTR_DEVICE, - MAIR_ATTR_NC_MEM, + MAIR_ATTR_4, MAIR_ATTR_5, MAIR_ATTR_6, MAIR_ATTR_7, -
-
[ ]
platform/drivers/ana/analog.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/ana/analog.h bes/platform/drivers/ana/analog.h index 29f5ec5309f..a115469189b 100644 --- a/platform/drivers/ana/analog.h +++ b/platform/drivers/ana/analog.h @@ -26,9 +26,10 @@ extern "C" { #include "plat_addr_map.h" #include CHIP_SPECIFIC_HDR(analog) -#define ANALOG_DEBUG_TRACE(n, s, ...) TR_DUMMY(n, s, ##__VA_ARGS__) -#define ANALOG_INFO_TRACE_IMM(n, s, ...) TR_INFO((n) | TR_ATTR_IMM, s, ##__VA_ARGS__) -#define ANALOG_INFO_TRACE(n, s, ...) TR_INFO(n, s, ##__VA_ARGS__) +#define ANALOG_DEBUG_TRACE(n, s, ...) +//TRACE(n, s, ##__VA_ARGS__) +#define ANALOG_DEBUG_TRACE_IMM(n, s, ...) TRACE_IMM(n, s, ##__VA_ARGS__) +#define ANALOG_INFO_TRACE(n, s, ...) TRACE(n, s, ##__VA_ARGS__) #ifndef ISPI_ANA_REG #define ISPI_ANA_REG(reg) (reg) -
-
[ ]
platform/drivers/ana/pmu.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/ana/pmu.h bes/platform/drivers/ana/pmu.h index 1f2b9069fcc..10998410065 100644 --- a/platform/drivers/ana/pmu.h +++ b/platform/drivers/ana/pmu.h @@ -26,9 +26,10 @@ extern "C" { #include "plat_addr_map.h" #include CHIP_SPECIFIC_HDR(pmu) -#define PMU_DEBUG_TRACE(n, s, ...) TR_DUMMY(n, s, ##__VA_ARGS__) -#define PMU_INFO_TRACE_IMM(n, s, ...) TR_INFO((n) | TR_ATTR_IMM, s, ##__VA_ARGS__) -#define PMU_INFO_TRACE(n, s, ...) TR_INFO(n, s, ##__VA_ARGS__) +#define PMU_DEBUG_TRACE(n, s, ...) LOG_DUMMY(n, s, ##__VA_ARGS__) +#define PMU_DEBUG_TRACE_IMM(n, s, ...) LOG_INFO((n) | LOG_ATTR_IMM, s, ##__VA_ARGS__) +#define PMU_INFO_TRACE_IMM(n, s, ...) LOG_INFO((n) | LOG_ATTR_IMM, s, ##__VA_ARGS__) +#define PMU_INFO_TRACE(n, s, ...) LOG_INFO(n, s, ##__VA_ARGS__) #ifndef ISPI_PMU_REG #define ISPI_PMU_REG(reg) (reg) @@ -133,7 +134,7 @@ int pmu_get_security_value(union SECURITY_VALUE_T *val); void pmu_shutdown(void); -void pmu_reboot(void); +void pmu_reset(void); int pmu_get_efuse(enum PMU_EFUSE_PAGE_T page, unsigned short *efuse); -
-
[ ]
platform/drivers/bt/bt_drv.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/bt/bt_drv.h bes/platform/drivers/bt/bt_drv.h index 9dd5c4d3bfd..1bf25d6d559 100644 --- a/platform/drivers/bt/bt_drv.h +++ b/platform/drivers/bt/bt_drv.h @@ -29,7 +29,7 @@ extern "C" { #include "hal_trace.h" #define BT_DRV_REG_OP_ENTER() do{ uint32_t stime, spent_time; stime= hal_sys_timer_get(); -#define BT_DRV_REG_OP_EXIT() spent_time = TICKS_TO_US(hal_sys_timer_get()-stime);if (spent_time>500)TRACE(2,"%s exit, %dus",__func__, spent_time);}while(0); +#define BT_DRV_REG_OP_EXIT() spent_time = TICKS_TO_US(hal_sys_timer_get()-stime);if (spent_time>300)TRACE(2,"%s exit, %dus",__func__, spent_time);}while(0); #define SBC_PKT_TYPE_DM1 0x3 #define SBC_PKT_TYPE_2EV3 0x6 @@ -48,12 +48,13 @@ extern "C" { #define btdrv_delay(ms) hal_sys_timer_delay(MS_TO_TICKS(ms)) -#define BTDIGITAL_REG(a) (*(volatile uint32_t *)(a)) -#define BTDIGITAL_REG_WR(addr, value) (*(volatile uint32_t *)(addr)) = (value) -#define BTDIGITAL_BT_EM(a) (*(volatile uint16_t *)(a)) +#define BTDIGITAL_REG(a) (*(volatile uint32_t *)(uintptr_t)(a)) +#define BTDIGITAL_REG_WR(addr, value) (*(volatile uint32_t *)(uintptr_t)(addr)) = (value) + +#define BTDIGITAL_BT_EM(a) (*(volatile uint16_t *)(uintptr_t)(a)) /// Macro to write a BT control structure field (16-bit wide) -#define BTDIGITAL_EM_BT_WR(addr, value) (*(volatile uint16_t *)(addr)) = (value) +#define BTDIGITAL_EM_BT_WR(addr, value) (*(volatile uint16_t *)(uintptr_t)(addr)) = (value) #define BTDIGITAL_REG_SET_FIELD(reg, mask, shift, v)\ do{ \ @@ -74,9 +75,8 @@ extern "C" { #define BT_DRV_TRACE(n, fmt, ...) TRACE(n, fmt, ##__VA_ARGS__) #define BT_DRV_DUMP(s,buff,len) DUMP8(s,buff,len) #else -#define BT_DRV_TRACE(n, fmt, ...) hal_trace_dummy(NULL, ##__VA_ARGS__) -#define BT_DRV_DUMP(s,buff,len) -#define BT_DRV_TRACE_CRASH_DUMP(n, fmt, ...) hal_trace_dummy(NULL, ##__VA_ARGS__) +#define BT_DRV_TRACE(n, fmt, ...) hal_trace_dummy(fmt, ##__VA_ARGS__) +#define BT_DRV_DUMP(s,buff,len) hal_dump_dummy(s, buff, len) #endif #define HCI_HOST_NB_CMP_PKTS_CMD_OPCODE 0x0C35 @@ -136,7 +136,7 @@ extern "C" { #define BT_ERRORTYPESTAT_ADDR (0xd0220060) #define MAX_NB_ACTIVE_ACL (3) -#if defined(CHIP_BEST2300A) +#ifdef CHIP_BEST2300A #define DEFAULT_XTAL_FCAP 0x80ad //8pf crstal No cap by luobin #else #define DEFAULT_XTAL_FCAP 0x8080 @@ -145,10 +145,10 @@ extern "C" { #elif defined(__FPGA_BT_1500__) #define BT_EM_ADDR_BASE (0xD0215000) #define BT_EM_SIZE (104) -#define EM_BLE_CS_OFFSET (0x178) +#define BLE_EM_CS_SIZE (112) #define EM_BT_PWRCNTL_ADDR (BT_EM_ADDR_BASE + 0x14) #define EM_BT_BT_EXT1_ADDR (BT_EM_ADDR_BASE + 0x60) -//#define EM_BT_BITOFF_ADDR //1501 don't have bitoff reg +#define EM_BT_BITOFF_ADDR //(BT_EM_ADDR_BASE + 0x02) #define EM_BT_CLKOFF0_ADDR (BT_EM_ADDR_BASE + 0x02) #define EM_BT_CLKOFF1_ADDR (BT_EM_ADDR_BASE + 0x04) #define EM_BT_WINCNTL_ADDR (BT_EM_ADDR_BASE + 0x18) @@ -159,14 +159,14 @@ extern "C" { #define EM_BT_LINKCNTL_ADDR (BT_EM_ADDR_BASE + 0x6) #define EM_BT_RXDESCCNT_ADDR (BT_EM_ADDR_BASE + 0x5A) -#define EM_BT_AUDIOBUF_OFF 0xd0218a70 -#define EM_BT_RXACLBUFPTR_ADDR 0xD0215482 -#define REG_EM_BT_RXDESC_SIZE 20 +#define EM_BT_AUDIOBUF_OFF 0xd02144fc +#define EM_BT_RXACLBUFPTR_ADDR 0xd02115f8 +#define REG_EM_BT_RXDESC_SIZE 16 #define LBRT_TX_PWR_FIX (3) -#define BT_CONTROLLER_CRASH_DUMP_ADDR_BASE (0xc0004050) +#define BT_CONTROLLER_CRASH_DUMP_ADDR_BASE (0xc0000050) #define BT_ERRORTYPESTAT_ADDR (0xd0220460) -#define DEFAULT_XTAL_FCAP 0x1300 +#define DEFAULT_XTAL_FCAP 0x8080 #define MAX_NB_ACTIVE_ACL (4) #else #define BT_EM_ADDR_BASE (0xd0210190) @@ -174,11 +174,15 @@ extern "C" { #define BT_CONTROLLER_CRASH_DUMP_ADDR_BASE (0xc00064cc) #endif +#ifndef __FPGA_BT_1500__ +//#define FPGA_1303 +#endif //bt max slot clock #define MAX_SLOT_CLOCK ((1L<<27) - 1) // A slot is 625 us #define SLOT_SIZE 625 +#define XTAL_OFFSET 50 //#define __PASS_CI_TEST_SETTING__ -
-
[ ]
platform/drivers/bt/bt_drv_interface.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/bt/bt_drv_interface.h bes/platform/drivers/bt/bt_drv_interface.h index 5e70dbcce36..9742a76b0e3 100644 --- a/platform/drivers/bt/bt_drv_interface.h +++ b/platform/drivers/bt/bt_drv_interface.h @@ -209,13 +209,13 @@ void btdrv_set_bt_pcm_en(uint8_t en); uint16_t btdrv_rf_bitoffset_get(uint8_t conidx); -void btdrv_syn_clr_trigger(uint8_t trig_route); +void btdrv_syn_clr_trigger(void); uint32_t btdrv_rf_bit_offset_get(void); uint32_t btdrv_syn_get_curr_ticks(void); uint32_t bt_syn_get_curr_ticks(uint16_t conhdl); int32_t bt_syn_get_offset_ticks(uint16_t conhdl); -void bt_syn_set_tg_ticks(uint32_t val,uint16_t conhdl, uint8_t mode, uint8_t trig_route); +void bt_syn_set_tg_ticks(uint32_t val,uint16_t conhdl, uint8_t mode); void bt_syn_trig_checker(uint16_t conhdl); void btdrv_syn_trigger_codec_en(uint32_t v); uint32_t btdrv_get_syn_trigger_codec_en(void); @@ -228,6 +228,7 @@ void btdrv_disable_playback_triggler(void); void btdrv_set_bt_pcm_triggler_en(uint8_t en); void btdrv_set_bt_pcm_triggler_delay(uint8_t delay); void btdrv_set_bt_pcm_triggler_delay_reset(uint8_t delay); +void btdrv_set_pcm_data_ignore_crc(void); uint8_t btdrv_conhdl_to_linkid(uint16_t connect_hdl); @@ -246,6 +247,7 @@ void btdrv_enable_one_packet_more_head(bool enable); #if defined(CHIP_BEST2300) || defined(CHIP_BEST1400) || defined(CHIP_BEST1402) || \ defined(CHIP_BEST2300P) || defined(CHIP_BEST2001) || defined(CHIP_BEST2300A) +void btdrv_linear_format_16bit_set(void); void btdrv_pcm_enable(void); void btdrv_pcm_disable(void); void btdrv_spi_trig_data_change(uint8_t spi_sel, uint8_t index, uint32_t value); @@ -288,7 +290,7 @@ void btdrv_open_pcm_fast_mode_disable(void); #endif #if defined(CVSD_BYPASS) -void btdrv_cvsd_bypass_enable(void); +void btdrv_cvsd_bypass_enable(uint8_t is_msbc); #endif void bt_drv_reg_op_write_private_public_key(uint8_t* private_key,uint8_t* public_key); @@ -298,6 +300,7 @@ void bt_drv_reg_op_write_private_public_key(uint8_t* private_key,uint8_t* public #define IS_ENABLE_BT_DRIVER_REG_DEBUG_READING 0 +void bt_drv_reg_op_acl_tx_silence(uint16_t connHandle, uint8_t on); int btdrv_slave2master_clkcnt_convert(uint32_t local_clk, uint16_t local_cnt, int32_t clk_offset, uint16_t bit_offset, @@ -321,6 +324,7 @@ void bt_drv_reg_op_get_ibrt_address(uint8_t *addr); void btdrv_enable_rf_sw(int rx_on, int tx_on); void btdrv_trigger_coredump(void); bool btdrv_is_ecc_enable(void); +void bt_drv_adaptive_fa_rx_gain(int8_t rssi); void* bt_drv_get_btstack_chip_config(void); void btdrv_spi_sel_ble_setf(int elt_idx, uint8_t spiselble); bool bt_drv_is_esco_auto_accept_support(void); @@ -333,15 +337,15 @@ void btdrv_softbit_enable(uint16_t connhdl, uint8_t type1,uint8_t type2,uint8_t void btdrv_play_trig_mode_set(uint8_t mode); #ifdef __SW_TRIG__ -void btdrv_sw_trig_master_set(uint32_t Tclk_M, int16_t Tbit_M_h_ori, uint8_t trig_route); -void btdrv_sw_trig_slave_calculate_and_set(uint16_t conhdl, uint32_t Tclk_M, int16_t Tbit_M_h_ori, uint8_t trig_route); +void btdrv_sw_trig_master_set(uint32_t Tclk_M, int16_t Tbit_M_h_ori); +void btdrv_sw_trig_slave_calculate_and_set(uint16_t conhdl, uint32_t Tclk_M, int16_t Tbit_M_h_ori); void btdrv_sync_sw_trig_store_tws_role(uint8_t role); uint8_t btdrv_sync_sw_trig_get_tws_role(void); void btdrv_sync_sw_trig_store_conhdl(uint16_t conhdl); uint16_t btdrv_sync_sw_trig_get_conhdl(void); void btdrv_sync_sw_trig_store_tws_conhdl(uint16_t conhdl); uint16_t btdrv_sync_sw_trig_get_tws_conhdl(void); -uint16_t btdrv_sw_trig_tg_finecnt_get(uint8_t trig_route); +uint16_t btdrv_sw_trig_tg_finecnt_get(void); int32_t bt_syn_get_clkoffset(uint16_t conhdl); void btdrv_sync_sw_trig_store_tg_clkoffset(int32_t clkoffset); int32_t btdrv_sync_sw_trig_get_tg_clkoffset(void); -
-
[ ]
platform/drivers/bt/bt_drv_internal.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/bt/bt_drv_internal.h bes/platform/drivers/bt/bt_drv_internal.h index d48d7ef8a82..78045438d2b 100644 --- a/platform/drivers/bt/bt_drv_internal.h +++ b/platform/drivers/bt/bt_drv_internal.h @@ -48,6 +48,7 @@ typedef uint32_t BT_CONTROLER_TRACE_TYPE; #define BT_FA_INVERT_EN 1 #define BT_FA_INVERT_DISABLE 0 +void bt_drv_set_fa_invert_enable(uint8_t en); uint8_t btdrv_rf_init(void); void btdrv_test_mode_rf_txpwr_init(void); void btdrv_ins_patch_init(void); -
-
[ ]
platform/drivers/bt/bt_drv_reg_op.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/bt/bt_drv_reg_op.h bes/platform/drivers/bt/bt_drv_reg_op.h index d655a6b03a6..7e546390070 100644 --- a/platform/drivers/bt/bt_drv_reg_op.h +++ b/platform/drivers/bt/bt_drv_reg_op.h @@ -136,12 +136,28 @@ struct dbg_set_ebq_test }; +void bt_drv_reg_op_rssi_set(uint16_t rssi); +void bt_drv_reg_op_scan_intv_set(uint32_t scan_intv); +void bt_drv_reg_op_encryptchange_errcode_reset(uint16_t hci_handle); +void bt_drv_reg_op_sco_sniffer_checker(void); +void bt_drv_reg_op_trigger_time_checker(void); +void bt_drv_reg_op_tws_output_power_fix_separate(uint16_t hci_handle, uint16_t pwr); +bool bt_drv_reg_op_ld_sniffer_env_monitored_dev_state_get(void); +void bt_drv_reg_op_ld_sniffer_env_monitored_dev_state_set(bool state); +void bt_drv_reg_op_ld_sniffer_master_addr_set(uint8_t * addr); int bt_drv_reg_op_currentfreeaclbuf_get(void); void bt_drv_reg_op_save_mobile_airpath_info(uint16_t hciHandle); void bt_drv_reg_op_block_xfer_with_mobile(uint16_t hciHandle); void bt_drv_reg_op_resume_xfer_with_mobile(uint16_t hciHandle); void bt_drv_reg_op_block_fast_ack_with_mobile(void); void bt_drv_reg_op_resume_fast_ack_with_mobile(void); +int bt_drv_reg_op_packet_type_checker(uint16_t hciHandle); +void bt_drv_reg_op_max_slot_setting_checker(uint16_t hciHandle); +void bt_drv_reg_op_force_task_dbg_idle(void); +void bt_drv_reg_op_afh_follow_mobile_mobileidx_set(uint16_t hciHandle); +void bt_drv_reg_op_afh_follow_mobile_twsidx_set(uint16_t hciHandle); +void bt_drv_reg_op_sco_status_store(void); +void bt_drv_reg_op_sco_status_restore(void); bool bt_drv_reg_op_sco_tx_buf_restore(uint8_t *trigger_test); void bt_drv_reg_op_afh_bak_reset(void); void bt_drv_reg_op_afh_bak_save(uint8_t role, uint16_t mobileHciHandle); @@ -149,6 +165,7 @@ void bt_drv_reg_op_connection_checker(void); void bt_drv_reg_op_bt_info_checker(void); uint8_t bt_drv_reg_op_get_controller_tx_free_buffer(void); uint8_t bt_drv_reg_op_get_controller_ble_tx_free_buffer(void); +void bt_drv_reg_op_ble_buffer_cleanup(void); bool bt_drv_reg_op_get_dbg_state(void); void bt_drv_reg_op_crash_dump(void); void bt_drv_reg_op_set_tx_pwr(uint16_t connHandle, uint8_t txpwr); @@ -159,12 +176,24 @@ uint16_t bt_drv_reg_op_get_lsto(uint16_t hciHandle); void bt_drv_reg_op_enable_emsack_mode(uint16_t connHandle, uint8_t master, uint8_t enable); void bt_drv_reg_op_set_accessible_mode(uint8_t mode); void bt_drv_reg_op_force_sco_retrans(bool enable); +void bt_drv_reg_op_enable_pcm_tx_hw_cal(void); void bt_drv_reg_op_monitor_clk(void); bool bt_drv_reg_op_read_rssi_in_dbm(uint16_t connHandle,rx_agc_t* rx_val); bool bt_drv_reg_op_read_ble_rssi_in_dbm(uint16_t connHandle,rx_agc_t* rx_val); void bt_drv_reg_op_set_swagc_mode(uint8_t mode); +void bt_drv_reg_op_set_reboot_pairing_mode(uint8_t mode); void bt_drv_reg_op_acl_silence(uint16_t connHandle, uint8_t silence); +void bt_drv_reg_op_call_monitor(uint16_t connHandle, uint8_t tws_role); +void bt_drv_reg_op_lock_sniffer_sco_resync(void); +void bt_drv_reg_op_unlock_sniffer_sco_resync(void); +void bt_drv_reg_op_afh_set_default(void); +void bt_drv_reg_op_update_sniffer_bitoffset(uint16_t mobile_conhdl,uint16_t master_conhdl); +void bt_drv_reg_op_modify_bitoff_timer(uint16_t time_out); +uint16_t em_bt_bitoff_getf(int elt_idx); +void bt_drv_reg_op_ble_llm_substate_hacker(void); +void bt_drv_reg_op_esco_acl_sniff_delay_cal(uint16_t hciHandle,bool enable); +bool bt_drv_reg_op_check_esco_acl_sniff_conflict(uint16_t hciHandle); void bt_drv_reg_op_set_tpoll(uint8_t linkid,uint16_t poll_interval); uint8_t bt_drv_reg_op_get_role(uint8_t linkid); int8_t bt_drv_reg_op_rssi_correction(int8_t rssi); @@ -182,6 +211,7 @@ void bt_drv_reg_op_acl_tx_type_trace(uint16_t hciHandle); uint8_t bt_drv_reg_op_acl_tx_type_get(uint16_t hciHandle, uint8_t* br_type, uint8_t* edr_type); void bt_drv_reg_op_lm_nb_sync_hacker(uint8_t sco_status); +void bt_drv_reg_op_afh_env_reset(void); void bt_drv_reg_op_acl_tx_silence(uint16_t connHandle, uint8_t on); void bt_drv_reg_op_acl_tx_silence_clear(uint16_t connHandle); @@ -284,14 +314,18 @@ void bt_drv_reg_op_set_ibrt_reject_sniff_req(bool en); uint8_t bt_drv_reg_op_get_esco_nego_airmode(uint8_t sco_link_id); void bt_drv_reg_op_hci_vender_ibrt_ll_monitor(uint8_t* ptr, uint16_t* p_sum_err,uint16_t* p_rx_total); uint32_t bt_drv_reg_op_get_host_ref_clk(void); +void bt_drv_reg_op_set_accept_new_mobile_enable(void); +void bt_drv_reg_op_clear_accept_new_mobile_enable(void); void bt_drv_reg_op_ecc_softbit_process(uint16_t* p_conn_handle1,uint16_t* p_conn_handle2, uint16_t length, uint8_t *data); void bt_drv_reg_op_ebq_test_setting(void); void bt_drv_reg_op_hw_spi_en_setf(int elt_idx, uint8_t hwspien); void bt_drv_enhance_fa_mode(bool enable); void bt_drv_reg_op_set_rand_seed(uint32_t seed); void bt_drv_reg_op_swagc_mode_set(uint8_t mode); +void bt_drv_reg_op_set_max_pwr_rcv(uint16_t connHandle); void bt_drv_reg_op_key_gen_after_reset(bool enable); uint8_t bt_drv_reg_op_bt_sync_swagc_en_get(void); +void bt_drv_reg_op_ble_sup_timeout_set(uint16_t ble_conhdl, uint16_t sup_to); #ifdef __cplusplus } -
-
[ ]
platform/drivers/codec/best2300p/codec_best2300p.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/codec/best2300p/codec_best2300p.h bes/platform/drivers/codec/best2300p/codec_best2300p.h index 24a21203202..a857751f9af 100644 --- a/platform/drivers/codec/best2300p/codec_best2300p.h +++ b/platform/drivers/codec/best2300p/codec_best2300p.h @@ -19,7 +19,9 @@ extern "C" { #endif +typedef void (*CODEC_ANC_BOOST_DELAY_FUNC)(uint32_t ms); +void codec_set_anc_boost_delay_func(CODEC_ANC_BOOST_DELAY_FUNC delay_func); #ifdef __cplusplus } -
-
[ ]
platform/drivers/norflash/norflash_drv.h-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/drivers/norflash/norflash_drv.h bes/platform/drivers/norflash/norflash_drv.h index df761036291..3883998c6c4 100644 --- a/platform/drivers/norflash/norflash_drv.h +++ b/platform/drivers/norflash/norflash_drv.h @@ -25,7 +25,9 @@ extern "C" { #define NORFLASH_ID_LEN 3 enum DRV_NORFLASH_ERASE_T { +#ifdef PUYA_FLASH_ERASE_PAGE_ENABLE DRV_NORFLASH_ERASE_PAGE, +#endif DRV_NORFLASH_ERASE_SECTOR, DRV_NORFLASH_ERASE_BLOCK, DRV_NORFLASH_ERASE_CHIP, @@ -70,114 +72,114 @@ union DRV_NORFLASH_SEC_REG_CFG_T { uint16_t enabled :1; uint16_t base :2; uint16_t size :2; - uint16_t offset :1; + uint16_t offset :2; uint16_t cnt :2; uint16_t pp :2; uint16_t lb :2; - uint16_t reserved :4; + uint16_t reserved :3; } s; uint16_t v; }; -typedef int (*NORFLASH_WRITE_STATUS_CB)(enum HAL_FLASH_ID_T id, enum DRV_NORFLASH_W_STATUS_T type, uint32_t param); +typedef int (*NORFLASH_WRITE_STATUS_CB)(enum DRV_NORFLASH_W_STATUS_T type, uint32_t param); struct NORFLASH_CFG_T { - uint8_t id[NORFLASH_ID_LEN]; - union DRV_NORFLASH_SPEED_RATIO_T speed_ratio; - uint8_t crm_en_bits; - uint8_t crm_dis_bits; - uint16_t block_protect_mask; - union DRV_NORFLASH_SEC_REG_CFG_T sec_reg_cfg; - uint16_t page_size; - uint16_t sector_size; - uint32_t block_size; - uint32_t total_size; - uint32_t max_speed; - uint32_t mode; - NORFLASH_WRITE_STATUS_CB write_status; + const uint8_t id[NORFLASH_ID_LEN]; + const union DRV_NORFLASH_SPEED_RATIO_T speed_ratio; + const uint8_t crm_en_bits; + const uint8_t crm_dis_bits; + const uint16_t block_protect_mask; + const union DRV_NORFLASH_SEC_REG_CFG_T sec_reg_cfg; + const uint16_t page_size; + const uint16_t sector_size; + const uint32_t block_size; + const uint32_t total_size; + const uint32_t max_speed; + const uint32_t mode; + const NORFLASH_WRITE_STATUS_CB write_status; }; -uint8_t norflash_read_status_s0_s7(enum HAL_FLASH_ID_T id); +uint8_t norflash_read_status_s0_s7(void); -uint8_t norflash_read_status_s8_s15(enum HAL_FLASH_ID_T id); +uint8_t norflash_read_status_s8_s15(void); -void norflash_status_WEL_0_wait(enum HAL_FLASH_ID_T id); +void norflash_status_WEL_0_wait(void); -enum HAL_NORFLASH_RET_T norflash_status_WIP_1_wait(enum HAL_FLASH_ID_T id, int suspend); +enum HAL_NORFLASH_RET_T norflash_status_WIP_1_wait(int suspend); -uint32_t norflash_get_supported_mode(enum HAL_FLASH_ID_T id); +uint32_t norflash_get_supported_mode(void); -uint32_t norflash_get_current_mode(enum HAL_FLASH_ID_T id); +uint32_t norflash_get_current_mode(void); -union DRV_NORFLASH_SEC_REG_CFG_T norflash_get_security_register_config(enum HAL_FLASH_ID_T id); +union DRV_NORFLASH_SEC_REG_CFG_T norflash_get_security_register_config(void); -uint32_t norflash_get_block_protect_mask(enum HAL_FLASH_ID_T id); +uint32_t norflash_get_block_protect_mask(void); -void norflash_reset(enum HAL_FLASH_ID_T id); +void norflash_reset(void); -int norflash_get_size(enum HAL_FLASH_ID_T id, uint32_t *total_size, uint32_t *block_size, uint32_t *sector_size, uint32_t *page_size); +int norflash_get_size(uint32_t *total_size, uint32_t *block_size, uint32_t *sector_size, uint32_t *page_size); -int norflash_set_mode(enum HAL_FLASH_ID_T id, uint32_t op); +int norflash_set_mode(uint32_t op); -int norflash_pre_operation(enum HAL_FLASH_ID_T id); +int norflash_pre_operation(void); -int norflash_post_operation(enum HAL_FLASH_ID_T id); +int norflash_post_operation(void); -int norflash_read_reg(enum HAL_FLASH_ID_T id, uint8_t cmd, uint8_t *val, uint32_t len); +int norflash_read_reg(uint8_t cmd, uint8_t *val, uint32_t len); -int norflash_read_reg_ex(enum HAL_FLASH_ID_T id, uint8_t cmd, uint8_t *param, uint32_t param_len, uint8_t *val, uint32_t len); +int norflash_read_reg_ex(uint8_t cmd, uint8_t *param, uint32_t param_len, uint8_t *val, uint32_t len); -int norflash_write_reg(enum HAL_FLASH_ID_T id, uint8_t cmd, const uint8_t *val, uint32_t len); +int norflash_write_reg(uint8_t cmd, const uint8_t *val, uint32_t len); -int norflash_init_sample_delay_by_div(enum HAL_FLASH_ID_T id, uint32_t div); +int norflash_init_sample_delay_by_div(uint32_t div); -void norflash_set_sample_delay_index(enum HAL_FLASH_ID_T id, uint32_t index); +void norflash_set_sample_delay_index(uint32_t index); -uint32_t norflash_get_sample_delay_index(enum HAL_FLASH_ID_T id); +uint32_t norflash_get_sample_delay_index(void); -int norflash_sample_delay_calib(enum HAL_FLASH_ID_T id, enum DRV_NORFLASH_CALIB_T type); +int norflash_sample_delay_calib(enum DRV_NORFLASH_CALIB_T type); -void norflash_show_calib_result(enum HAL_FLASH_ID_T id); +void norflash_show_calib_result(void); -int norflash_init_div(enum HAL_FLASH_ID_T id, const struct HAL_NORFLASH_CONFIG_T *cfg); +int norflash_init_div(const struct HAL_NORFLASH_CONFIG_T *cfg); -int norflash_match_chip(enum HAL_FLASH_ID_T id, const uint8_t *dev_id, uint32_t len); +int norflash_match_chip(const uint8_t *id, uint32_t len); -int norflash_get_id(enum HAL_FLASH_ID_T id, uint8_t *value, uint32_t len); +int norflash_get_id(uint8_t *value, uint32_t len); -int norflash_get_unique_id(enum HAL_FLASH_ID_T id, uint8_t *value, uint32_t len); +int norflash_get_unique_id(uint8_t *value, uint32_t len); -enum HAL_NORFLASH_RET_T norflash_erase(enum HAL_FLASH_ID_T id, uint32_t start_address, enum DRV_NORFLASH_ERASE_T type, int suspend); +enum HAL_NORFLASH_RET_T norflash_erase(uint32_t start_address, enum DRV_NORFLASH_ERASE_T type, int suspend); -enum HAL_NORFLASH_RET_T norflash_erase_resume(enum HAL_FLASH_ID_T id, int suspend); +enum HAL_NORFLASH_RET_T norflash_erase_resume(int suspend); -enum HAL_NORFLASH_RET_T norflash_write(enum HAL_FLASH_ID_T id, uint32_t start_address, const uint8_t *buffer, uint32_t len, int suspend); +enum HAL_NORFLASH_RET_T norflash_write(uint32_t start_address, const uint8_t *buffer, uint32_t len, int suspend); -enum HAL_NORFLASH_RET_T norflash_write_resume(enum HAL_FLASH_ID_T id, int suspend); +enum HAL_NORFLASH_RET_T norflash_write_resume(int suspend); int norflash_suspend_check_irq(uint32_t irq_num); -int norflash_read(enum HAL_FLASH_ID_T id, uint32_t start_address, uint8_t *buffer, uint32_t len); +int norflash_read(uint32_t start_address, uint8_t *buffer, uint32_t len); -void norflash_sleep(enum HAL_FLASH_ID_T id); +void norflash_sleep(void); -void norflash_wakeup(enum HAL_FLASH_ID_T id); +void norflash_wakeup(void); -int norflash_init_status(enum HAL_FLASH_ID_T id, uint32_t status); +int norflash_init_status(uint32_t status); -int norflash_set_block_protection(enum HAL_FLASH_ID_T id, uint32_t bp); +int norflash_set_block_protection(uint32_t bp); -int norflash_security_register_lock(enum HAL_FLASH_ID_T id, uint32_t id_map); +int norflash_security_register_lock(uint32_t id); -enum HAL_NORFLASH_RET_T norflash_security_register_erase(enum HAL_FLASH_ID_T id, uint32_t start_address); +enum HAL_NORFLASH_RET_T norflash_security_register_erase(uint32_t start_address); -enum HAL_NORFLASH_RET_T norflash_security_register_write(enum HAL_FLASH_ID_T id, uint32_t start_address, const uint8_t *buffer, uint32_t len); +enum HAL_NORFLASH_RET_T norflash_security_register_write(uint32_t start_address, const uint8_t *buffer, uint32_t len); -int norflash_security_register_read(enum HAL_FLASH_ID_T id, uint32_t start_address, uint8_t *buffer, uint32_t len); +int norflash_security_register_read(uint32_t start_address, uint8_t *buffer, uint32_t len); -uint32_t norflash_security_register_enable_read(enum HAL_FLASH_ID_T id); +uint32_t norflash_security_register_enable_read(void); -void norflash_security_register_disable_read(enum HAL_FLASH_ID_T id, uint32_t mode); +void norflash_security_register_disable_read(uint32_t mode); #ifdef __cplusplus } -
-
[ ]
platform/hal/best2300p/hal_analogif_best2300p.c-
Declared
BES Licensein SDK version. -
Relicense to
Apache-2.0. -
Diff of changes (click to view)
diff --git reconstruction/platform/hal/best2300p/hal_analogif_best2300p.c bes/platform/hal/best2300p/hal_analogif_best2300p.c index a8593f8a4e2..a4d6d240a73 100644 --- a/platform/hal/best2300p/hal_analogif_best2300p.c +++ b/platform/hal/best2300p/hal_analogif_best2300p.c @@ -23,7 +23,7 @@ #define ANA_CHIP_ID_SHIFT (4) #define ANA_CHIP_ID_MASK (0xFFF << ANA_CHIP_ID_SHIFT) #define ANA_CHIP_ID(n) BITFIELD_VAL(ANA_CHIP_ID, n) -#define ANA_VAL_CHIP_ID 0x203 +#define ANA_VAL_CHIP_ID 0x18E // ISPI_ARBITRATOR_ENABLE should be defined when: // 1) BT and MCU will access RF register at the same time; or @@ -38,42 +38,32 @@ #define PADDING_CYCLES 0 #endif -#define ANA_READ_CMD(r) (((1 << 26) | (((r) & 0x3FF) << 16)) << PADDING_CYCLES) -#define ANA_WRITE_CMD(r, v) (((((r) & 0x3FF) << 16) | ((v) & 0xFFFF)) << PADDING_CYCLES) +#define ANA_READ_CMD(r) (((1 << 24) | (((r) & 0xFF) << 16)) << PADDING_CYCLES) +#define ANA_WRITE_CMD(r, v) (((((r) & 0xFF) << 16) | ((v) & 0xFFFF)) << PADDING_CYCLES) #define ANA_READ_VAL(v) (((v) >> PADDING_CYCLES) & 0xFFFF) #define ANA_PAGE_1 0xA010 #define ANA_PAGE_0 0xA000 -#define ANA_PAGE_QTY 2 -#define ISPI_REG_CS(r) ((r) >> 12) -#define ISPI_REG_OFFSET(r) ((r) & 0x3FF) - -enum ANAIF_CS_T { - ANAIF_CS_PMU = 0, - ANAIF_CS_ANA, - ANAIF_CS_BTRF, - ANAIF_CS_WIFIRF, - - ANAIF_CS_QTY, +static const BOOT_RODATA_SRAM_LOC uint8_t page_reg[3] = { + 0x00, 0x60, 0x80, }; -static const struct HAL_SPI_CFG_T spi_cfg = { +static const BOOT_RODATA_FLASH_LOC struct HAL_SPI_CFG_T spi_cfg = { .clk_delay_half = false, .clk_polarity = false, .slave = false, .dma_rx = false, .dma_tx = false, - .rx_sep_line = true, + .rx_sep_line = false, .cs = 0, .rate = 6500000, - .tx_bits = 27 + PADDING_CYCLES, - .rx_bits = 27 + PADDING_CYCLES, + .tx_bits = 25 + PADDING_CYCLES, + .rx_bits = 25 + PADDING_CYCLES, .rx_frame_bits = 0, }; static bool BOOT_BSS_LOC analogif_inited = false; -static uint8_t BOOT_BSS_LOC ana_cs; static int BOOT_TEXT_SRAM_LOC hal_analogif_rawread(unsigned short reg, unsigned short *val) { @@ -107,18 +97,45 @@ static int BOOT_TEXT_SRAM_LOC hal_analogif_rawwrite(unsigned short reg, unsigned int BOOT_TEXT_SRAM_LOC hal_analogif_reg_read(unsigned short reg, unsigned short *val) { uint32_t lock; - uint8_t cs; + uint32_t idx; int ret; - cs = ISPI_REG_CS(reg); - reg = ISPI_REG_OFFSET(reg); +#if defined(USE_CYBERON) +extern int cyb_efuse_check_status(void); + + if (cyb_efuse_check_status()) { + if (reg == 0x5e) { + *val = 49185; + return 0; + } + if (reg == 0x00) { + *val = 0x20e0; + return 0; + } + } +#endif - lock = int_lock(); - if (cs != ana_cs) { - hal_ispi_activate_cs(cs); - ana_cs = cs; + if (reg < 0x100) { + lock = int_lock(); + ret = hal_analogif_rawread(reg, val); + int_unlock(lock); + return ret; + } else if (reg >= 0x100 && reg <= 0x15F) { + idx = 0; + } else if (reg >= 0x160 && reg <= 0x17F) { + idx = 1; + } else if (reg >= 0x180 && reg <= 0x1FF) { + idx = 2; + } else { + return -1; } + + reg &= 0xFF; + + lock = int_lock(); + hal_analogif_rawwrite(page_reg[idx], ANA_PAGE_1); ret = hal_analogif_rawread(reg, val); + hal_analogif_rawwrite(page_reg[idx], ANA_PAGE_0); int_unlock(lock); return ret; @@ -127,18 +144,30 @@ int BOOT_TEXT_SRAM_LOC hal_analogif_reg_read(unsigned short reg, unsigned short int BOOT_TEXT_SRAM_LOC hal_analogif_reg_write(unsigned short reg, unsigned short val) { uint32_t lock; - uint8_t cs; + uint32_t idx; int ret; - cs = ISPI_REG_CS(reg); - reg = ISPI_REG_OFFSET(reg); + if (reg < 0x100) { + lock = int_lock(); + ret = hal_analogif_rawwrite(reg, val); + int_unlock(lock); + return ret; + } else if (reg >= 0x100 && reg <= 0x15F) { + idx = 0; + } else if (reg >= 0x160 && reg <= 0x17F) { + idx = 1; + } else if (reg >= 0x180 && reg <= 0x1FF) { + idx = 2; + } else { + return -1; + } + + reg &= 0xFF; lock = int_lock(); - if (cs != ana_cs) { - hal_ispi_activate_cs(cs); - ana_cs = cs; - } + hal_analogif_rawwrite(page_reg[idx], ANA_PAGE_1); ret = hal_analogif_rawwrite(reg, val); + hal_analogif_rawwrite(page_reg[idx], ANA_PAGE_0); int_unlock(lock); return ret; -
Parent Issue: #76
The list below are files that have been released in the past by BES. These files are largely similar to those previous releases but include changes that have not been explicitly licensed publicly under an open source license.
Included are the license declared in the SDK, the license we would like the source file relicensed to, and a diff between the reconstruction and the SDK.
Unless indicated otherwise, all files below were previously made public by BES under the
Apache-2.0license.