Skip to content

Commit be6df55

Browse files
NonPIayerCharacterNonPIayerCharacter
committed
cut some code
1 parent a3d0fbd commit be6df55

File tree

9 files changed

+20
-97
lines changed

9 files changed

+20
-97
lines changed

‎platforms/RTL8710A/OpenBeken.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ SRC_C += $(OBK_DIR)/src/devicegroups/deviceGroups_util.c
2929
SRC_C += $(OBK_DIR)/src/devicegroups/deviceGroups_write.c
3030
SRC_C += $(OBK_DIR)/src/driver/drv_main.c
3131
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710a/hal_adc_rtl8710a.c
32-
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710a/hal_generic_rtl8710a.c
3332
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710a/hal_main_rtl8710a.c
3433
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710a/hal_uart_rtl8710a.c
3534
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710a/hal_pins_rtl8710a.c
3635
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashConfig_realtek.c
3736
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashVars_realtek.c
37+
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_generic_realtek.c
3838
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_pins_realtek.c
3939
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_wifi_realtek.c
4040
SRC_C += $(OBK_DIR)/src/hal/generic/hal_adc_generic.c

‎platforms/RTL8710B/OpenBeken.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ SRC_C += $(OBK_DIR)/src/devicegroups/deviceGroups_util.c
2929
SRC_C += $(OBK_DIR)/src/devicegroups/deviceGroups_write.c
3030
SRC_C += $(OBK_DIR)/src/driver/drv_main.c
3131
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710b/hal_adc_rtl8710b.c
32-
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710b/hal_generic_rtl8710b.c
3332
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710b/hal_main_rtl8710b.c
3433
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710b/hal_uart_rtl8710b.c
3534
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl8710b/hal_pins_rtl8710b.c
3635
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashConfig_realtek.c
3736
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashVars_realtek.c
37+
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_generic_realtek.c
3838
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_pins_realtek.c
3939
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_wifi_realtek.c
4040
SRC_C += $(OBK_DIR)/src/hal/generic/hal_adc_generic.c

‎platforms/RTL8720D/OpenBeken.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ CSRC += devicegroups/deviceGroups_util.c
2626
CSRC += devicegroups/deviceGroups_write.c
2727
CSRC += driver/drv_main.c
2828
#CSRC += hal/realtek/rtl8720d/hal_adc_rtl8710b.c
29-
CSRC += hal/realtek/rtl8720d/hal_generic_rtl8720d.c
3029
#CSRC += hal/realtek/rtl8720d/hal_main_rtl8710b.c
3130
CSRC += hal/realtek/rtl8720d/hal_uart_rtl8720d.c
3231
CSRC += hal/realtek/rtl8720d/hal_pins_rtl8720d.c
3332
CSRC += hal/realtek/hal_flashConfig_realtek.c
3433
CSRC += hal/realtek/hal_flashVars_realtek.c
34+
CSRC += hal/realtek/hal_generic_realtek.c
3535
CSRC += hal/realtek/hal_pins_realtek.c
3636
CSRC += hal/realtek/hal_wifi_realtek.c
3737
CSRC += hal/generic/hal_adc_generic.c

‎platforms/RTL87X0C/OpenBeken.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ SRC_C += $(OBK_DIR)/src/devicegroups/deviceGroups_util.c
2828
SRC_C += $(OBK_DIR)/src/devicegroups/deviceGroups_write.c
2929
SRC_C += $(OBK_DIR)/src/driver/drv_main.c
3030
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_adc_rtl87x0c.c
31-
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_generic_rtl87x0c.c
3231
#SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_main_rtl87x0c.c
3332
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_pins_rtl87x0c.c
3433
SRC_C += $(OBK_DIR)/src/hal/realtek/rtl87x0c/hal_uart_rtl87x0c.c
3534
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashConfig_realtek.c
3635
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_flashVars_realtek.c
36+
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_generic_realtek.c
3737
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_pins_realtek.c
3838
SRC_C += $(OBK_DIR)/src/hal/realtek/hal_wifi_realtek.c
3939
SRC_C += $(OBK_DIR)/src/hal/generic/hal_adc_generic.c

‎src/hal/realtek/rtl8710b/hal_generic_rtl8710b.c renamed to ‎src/hal/realtek/hal_generic_realtek.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
1-
#ifdef PLATFORM_RTL8710B
1+
#ifdef PLATFORM_REALTEK
22

3-
#include "../../hal_generic.h"
3+
#include "../hal_generic.h"
44
#include "sys_api.h"
55

6+
#ifdef PLATFORM_RTL8710B
67
extern int g_sleepfactor;
8+
#define haldelay delay * g_sleepfactor
9+
#else
10+
#define haldelay delay
11+
#endif
712

813
void HAL_RebootModule()
914
{
10-
//sys_cpu_reset();
1115
ota_platform_reset();
1216
}
1317

1418
void HAL_Delay_us(int delay)
1519
{
16-
DelayUs(delay * g_sleepfactor);
20+
#if PLATFORM_RTL87X0C
21+
hal_delay_us(delay);
22+
#elif PLATFORM_RTL8710A
23+
HalDelayUs(delay);
24+
#else
25+
DelayUs(haldelay);
26+
#endif
1727
}
1828

1929
void HAL_Configure_WDT()
@@ -27,4 +37,4 @@ void HAL_Run_WDT()
2737
watchdog_refresh();
2838
}
2939

30-
#endif // PLATFORM_RTL8710B
40+
#endif // PLATFORM_REALTEK

‎src/hal/realtek/hal_pins_realtek.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void HAL_PIN_PWM_Update(int index, float value)
137137
rtlPinMapping_t* pin = g_pins + index;
138138
#ifdef PLATFORM_RTL87X0C
139139
if(pin->pwm == NULL || !pin->pwm->is_init) return;
140-
#elif PLATFORM_RTL8710B
140+
#else
141141
if(pin->pwm == NULL) return;
142142
#endif
143143
pwmout_write(pin->pwm, value / 100);

‎src/hal/realtek/rtl8710a/hal_generic_rtl8710a.c

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/hal/realtek/rtl8720d/hal_generic_rtl8720d.c

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/hal/realtek/rtl87x0c/hal_generic_rtl87x0c.c

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)