Skip to content

Commit 36e01ef

Browse files
ArchcadyArchcady
committed
improve coding style
1 parent 06ee836 commit 36e01ef

File tree

10 files changed

+68
-59
lines changed

10 files changed

+68
-59
lines changed

‎targets/TARGET_Realtek/TARGET_AMEBA/analogin_api.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ extern u32 ConfigDebugErr;
2929
extern u32 ConfigDebuginfo;
3030

3131

32-
void analogin_init (analogin_t *obj, PinName pin){
33-
32+
void analogin_init (analogin_t *obj, PinName pin)
33+
{
3434
uint32_t adc_idx;
3535
PSAL_ADC_MNGT_ADPT pSalADCMngtAdpt = NULL;
3636
PSAL_ADC_USERCB_ADPT pSalADCUserCBAdpt = NULL;
@@ -71,7 +71,6 @@ void analogin_init (analogin_t *obj, PinName pin){
7171

7272
/* To backup user config first */
7373
//_memcpy(pHalADCInitDataTmp, &(obj->HalADCInitData), sizeof(HAL_ADC_INIT_DAT));
74-
7574

7675
pSalADCMngtAdpt->pHalInitDat = &(obj->HalADCInitData);
7776
pSalADCMngtAdpt->pHalOp = &(obj->HalADCOp);
@@ -129,7 +128,8 @@ void analogin_init (analogin_t *obj, PinName pin){
129128
RtkADCInit(pSalADCHND);
130129
}
131130

132-
float analogin_read(analogin_t *obj){
131+
float analogin_read(analogin_t *obj)
132+
{
133133
float value;
134134
uint32_t AnaloginTmp[2] = {0,0};
135135
uint32_t AnaloginDatMsk = 0xFFFF;
@@ -158,7 +158,8 @@ float analogin_read(analogin_t *obj){
158158
return (float)value;
159159
}
160160

161-
uint16_t analogin_read_u16(analogin_t *obj){
161+
uint16_t analogin_read_u16(analogin_t *obj)
162+
{
162163
uint32_t AnaloginTmp[2] = {0,0};
163164
uint32_t AnaloginDatMsk = 0xFFFF;
164165
uint8_t AnaloginIdx = 0;
@@ -178,11 +179,11 @@ uint16_t analogin_read_u16(analogin_t *obj){
178179
AnalogDat = (AnalogDat>>((u32)(16*(AnaloginIdx&0x01))));
179180

180181
return (uint16_t)AnalogDat;
181-
182182
}
183183

184184

185-
void analogin_deinit(analogin_t *obj){
185+
void analogin_deinit(analogin_t *obj)
186+
{
186187
PSAL_ADC_MNGT_ADPT pSalADCMngtAdpt = NULL;
187188
PSAL_ADC_HND pSalADCHND = NULL;
188189

‎targets/TARGET_Realtek/TARGET_AMEBA/analogout_api.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
* \para dac_t *: obj
3535
* \para PinName: pin
3636
*/
37-
void analogout_init(dac_t *obj, PinName pin) {
37+
void analogout_init(dac_t *obj, PinName pin)
38+
{
3839
uint32_t dac_idx;
3940
uint32_t DacTemp;
4041
PHAL_DAC_INIT_DAT pHalDacInitData = (PHAL_DAC_INIT_DAT)&(obj->DACpara);
@@ -90,7 +91,8 @@ void analogout_init(dac_t *obj, PinName pin) {
9091
* This function is mainly to free a DAC channel.
9192
* \para dac_t *: obj
9293
*/
93-
void analogout_free(dac_t *obj) {
94+
void analogout_free(dac_t *obj)
95+
{
9496
PHAL_DAC_INIT_DAT pHalDacInitData = (PHAL_DAC_INIT_DAT)&(obj->DACpara);
9597

9698
HalDACPinMuxDeInit(pHalDacInitData);
@@ -110,7 +112,8 @@ void analogout_free(dac_t *obj) {
110112
* \para dac_t * : obj
111113
* \para float : value
112114
*/
113-
void analogout_write(dac_t *obj, float value) {
115+
void analogout_write(dac_t *obj, float value)
116+
{
114117
uint32_t dactemp;
115118
uint16_t dacnegtemp;
116119
PHAL_DAC_INIT_DAT pHalDacInitData = (PHAL_DAC_INIT_DAT)&(obj->DACpara);
@@ -149,7 +152,8 @@ void analogout_write(dac_t *obj, float value) {
149152
* \para dac_t * : obj
150153
* \para float : value
151154
*/
152-
void analogout_write_u16(dac_t *obj, uint16_t value) {
155+
void analogout_write_u16(dac_t *obj, uint16_t value)
156+
{
153157
uint32_t dactemp;
154158
PHAL_DAC_INIT_DAT pHalDacInitData = (PHAL_DAC_INIT_DAT)&(obj->DACpara);
155159

@@ -165,7 +169,8 @@ void analogout_write_u16(dac_t *obj, uint16_t value) {
165169
* It always returns a fixed value of 0.0;
166170
* \para dac_t * : obj
167171
*/
168-
float analogout_read(dac_t *obj) {
172+
float analogout_read(dac_t *obj)
173+
{
169174
return (float)0.0;
170175
}
171176

@@ -176,7 +181,8 @@ float analogout_read(dac_t *obj) {
176181
* It always returns a fixed value of 0xFFFF;
177182
* \para dac_t * : obj
178183
*/
179-
uint16_t analogout_read_u16(dac_t *obj) {
184+
uint16_t analogout_read_u16(dac_t *obj)
185+
{
180186
return (uint16_t)0xFFFF;
181187
}
182188

‎targets/TARGET_Realtek/TARGET_AMEBA/flash_api.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@ int flash_burst_write(flash_t *obj, uint32_t address ,uint32_t Length, uint8_t *
452452

453453
SpicDisableRtl8195A();
454454
return 1;
455-
456455
}
457456
/**
458457
* @brief Read a stream of data from specified address
@@ -563,7 +562,6 @@ int flash_get_extend_addr(flash_t *obj)
563562

564563
SpicDisableRtl8195A();
565564
return Status;
566-
567565
}
568566

569567

‎targets/TARGET_Realtek/TARGET_AMEBA/gpio_api.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,16 @@ void gpio_mode(gpio_t *obj, PinMode mode)
103103
}
104104

105105
// Initial the Pin direction
106-
void gpio_dir(gpio_t *obj, PinDirection direction) {
106+
void gpio_dir(gpio_t *obj, PinDirection direction)
107+
{
107108
obj->direction = direction;
108109
gpio_set_hal_pin_mode(obj);
109110
HAL_GPIO_Init(&obj->hal_pin);
110111
}
111112

112113
// Change the pin direction directly
113-
void gpio_change_dir(gpio_t *obj, PinDirection direction) {
114+
void gpio_change_dir(gpio_t *obj, PinDirection direction)
115+
{
114116
uint32_t reg_value;
115117
uint8_t port_num;
116118
uint8_t pin_num;
@@ -151,7 +153,8 @@ void gpio_write(gpio_t *obj, int value)
151153
}
152154
}
153155

154-
int gpio_read(gpio_t *obj) {
156+
int gpio_read(gpio_t *obj)
157+
{
155158
volatile uint32_t reg_value;
156159
uint8_t port_num;
157160
uint8_t pin_num;
@@ -191,7 +194,8 @@ void gpio_pull_ctrl(gpio_t *obj, PinMode pull_type)
191194
}
192195

193196

194-
void gpio_deinit(gpio_t *obj) {
197+
void gpio_deinit(gpio_t *obj)
198+
{
195199
HAL_GPIO_DeInit(&obj->hal_pin);
196200
}
197201

‎targets/TARGET_Realtek/TARGET_AMEBA/i2c_api.c

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ static SAL_I2C_TRANSFER_BUF i2ctxtranbuf[4];
7676
static SAL_I2C_TRANSFER_BUF i2crxtranbuf[4];
7777
extern u32 ConfigDebugErr;
7878
extern u32 ConfigDebuginfo;
79-
void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
80-
79+
void i2c_init(i2c_t *obj, PinName sda, PinName scl)
80+
{
8181
uint32_t i2c_sel;
8282
uint32_t i2c_idx;
8383
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
@@ -191,7 +191,8 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
191191
RtkI2CInitForPS(pSalI2CHND);
192192
}
193193

194-
void i2c_frequency(i2c_t *obj, int hz) {
194+
void i2c_frequency(i2c_t *obj, int hz)
195+
{
195196
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
196197
PSAL_I2C_HND pSalI2CHND = NULL;
197198
pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt);
@@ -225,23 +226,23 @@ void i2c_frequency(i2c_t *obj, int hz) {
225226
}
226227
}
227228

228-
inline int i2c_start(i2c_t *obj) {
229+
inline int i2c_start(i2c_t *obj)
230+
{
229231
address_save_int = 0;
230232
Byte_count = 0;
231233
memset(address_save, 0, sizeof(address_save));
232234
return 0;
233235
}
234236

235-
inline int i2c_stop(i2c_t *obj) {
237+
inline int i2c_stop(i2c_t *obj)
238+
{
236239
return 0;
237240
}
238241

239-
extern u32
240-
HalDelayUs(
241-
IN u32 us
242-
);
242+
extern u32 HalDelayUs(IN u32 us);
243243

244-
int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
244+
int i2c_read(i2c_t *obj, int address, char *data, int length, int stop)
245+
{
245246

246247
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
247248
PSAL_I2C_HND pSalI2CHND = NULL;
@@ -308,8 +309,8 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
308309
}
309310
}
310311

311-
int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
312-
312+
int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop)
313+
{
313314
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
314315
PSAL_I2C_HND pSalI2CHND = NULL;
315316
u32 I2CInTOTcnt = 0;
@@ -373,7 +374,8 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
373374
}
374375
}
375376

376-
int i2c_byte_read(i2c_t *obj, int last) {
377+
int i2c_byte_read(i2c_t *obj, int last)
378+
{
377379
uint8_t i2cdatlocal;
378380
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
379381
PSAL_I2C_HND pSalI2CHND = NULL;
@@ -396,7 +398,8 @@ int i2c_byte_read(i2c_t *obj, int last) {
396398
return (int)i2cdatlocal;
397399
}
398400

399-
int i2c_byte_write(i2c_t *obj, int data) {
401+
int i2c_byte_write(i2c_t *obj, int data)
402+
{
400403
if(Byte_count<3){
401404
address_save[Byte_count]=data;
402405
Byte_count++;
@@ -434,7 +437,8 @@ int i2c_byte_write(i2c_t *obj, int data) {
434437
return 1;
435438
}
436439

437-
void i2c_reset(i2c_t *obj) {
440+
void i2c_reset(i2c_t *obj)
441+
{
438442
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
439443
PSAL_I2C_HND pSalI2CHND = NULL;
440444
pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt);
@@ -446,7 +450,8 @@ void i2c_reset(i2c_t *obj) {
446450

447451
#if DEVICE_I2CSLAVE
448452

449-
void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) {
453+
void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask)
454+
{
450455
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
451456
PSAL_I2C_HND pSalI2CHND = NULL;
452457
pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt);
@@ -463,8 +468,8 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask) {
463468
}
464469
}
465470

466-
void i2c_slave_mode(i2c_t *obj, int enable_slave) {
467-
471+
void i2c_slave_mode(i2c_t *obj, int enable_slave)
472+
{
468473
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
469474
PSAL_I2C_HND pSalI2CHND = NULL;
470475
pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt);
@@ -491,8 +496,8 @@ void i2c_slave_mode(i2c_t *obj, int enable_slave) {
491496
#define WriteGeneral 2 // the master is writing to all slave
492497
#define WriteAddressed 3 // the master is writing to this slave (slave = receiver)
493498

494-
int i2c_slave_receive(i2c_t *obj) {
495-
499+
int i2c_slave_receive(i2c_t *obj)
500+
{
496501
int i2cslvrevsts = NoData;
497502
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
498503
PSAL_I2C_HND pSalI2CHND = NULL;
@@ -503,8 +508,8 @@ int i2c_slave_receive(i2c_t *obj) {
503508
return i2cslvrevsts;
504509
}
505510

506-
int i2c_slave_read(i2c_t *obj, char *data, int length) {
507-
511+
int i2c_slave_read(i2c_t *obj, char *data, int length)
512+
{
508513
u32 I2CInTOTcnt = 0;
509514
u32 InTimeoutCount = 0;
510515
u32 InStartCount = 0;
@@ -554,7 +559,8 @@ int i2c_slave_read(i2c_t *obj, char *data, int length) {
554559
}
555560
}
556561

557-
int i2c_slave_write(i2c_t *obj, const char *data, int length) {
562+
int i2c_slave_write(i2c_t *obj, const char *data, int length)
563+
{
558564
PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
559565
PSAL_I2C_HND pSalI2CHND = NULL;
560566
pSalI2CMngtAdpt = &(obj->SalI2CMngtAdpt);

‎targets/TARGET_Realtek/TARGET_AMEBA/log_uart_api.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,11 @@ int32_t log_uart_init (log_uart_t *obj, int baudrate, int data_bits, SerialParit
5454
if (log_uart_support_rate[i] == baudrate) {
5555
break;
5656
}
57-
}
58-
57+
}
5958
if (log_uart_support_rate[i]== 0xFFFFFF) {
6059
DBG_UART_ERR("log_uart_init: Not support Baud Rate %d\n", baudrate);
6160
return -1;
6261
}
63-
6462
// check word width
6563
if ((data_bits < 5) || (data_bits > 8)) {
6664
DBG_UART_ERR("log_uart_init: Not support Word Width %d\n", data_bits);
@@ -150,20 +148,17 @@ void log_uart_baud(log_uart_t *obj, int baudrate)
150148
break;
151149
}
152150
}
153-
154151
if (log_uart_support_rate[i]== 0xFFFFFF) {
155152
DBG_UART_ERR("log_uart_baud: Not support Baud Rate %d\n", baudrate);
156153
return;
157154
}
158-
159155
pUartAdapter->BaudRate = baudrate;
160156
HalLogUartSetBaudRate(pUartAdapter);
161157
}
162158

163159
void log_uart_format(log_uart_t *obj, int data_bits, SerialParity parity, int stop_bits)
164160
{
165161
HAL_LOG_UART_ADAPTER *pUartAdapter;
166-
167162
pUartAdapter = &obj->log_hal_uart;
168163

169164
// check word width

‎targets/TARGET_Realtek/TARGET_AMEBA/port_api.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ extern u32 HAL_GPIO_GetPinName(u32 chip_pin);
7171

7272
// high nibble = port number (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...)
7373
// low nibble = pin number
74-
PinName port_pin(PortName port, int pin_n) {
74+
PinName port_pin(PortName port, int pin_n)
75+
{
7576
return (PinName)(pin_n + (port << 4));
7677
}
7778

@@ -214,5 +215,5 @@ int port_read(port_t *obj)
214215
return value;
215216
}
216217

217-
#endif
218-
#endif
218+
#endif //#if DEVICE_PORTIN || DEVICE_PORTOUT
219+
#endif //#if CONFIG_GPIO_EN

‎targets/TARGET_Realtek/TARGET_AMEBA/pwmout_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us)
141141
}
142142

143143
#endif // #ifdef CONFIG_PWM_EN
144-
#endif
144+
#endif // #if DEVICE_PWMOUT

‎targets/TARGET_Realtek/TARGET_AMEBA/serial_api.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ void serial_free(serial_t *obj)
186186
#endif
187187
}
188188

189-
void serial_baud(serial_t *obj, int baudrate) {
189+
void serial_baud(serial_t *obj, int baudrate)
190+
{
190191
#ifdef CONFIG_MBED_ENABLED
191192
if(obj->index == UART_3){
192193
return;
@@ -459,5 +460,5 @@ void serial_pinout_tx(PinName tx)
459460

460461
#if DEVICE_SERIAL_ASYNCH
461462
#endif
462-
#endif
463+
#endif //#if CONFIG_UART_EN
463464

0 commit comments

Comments
 (0)