Skip to content

Commit 00fadec

Browse files
committed
Whitespace cleanup of target_{board,config,family}.h.
1 parent 6b0a9ea commit 00fadec

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

source/target/target_board.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "string.h"
2323
#include "target_board.h"
2424

25-
// Default empty board info.
26-
__attribute__((weak))
25+
// Default empty board info.
26+
__attribute__((weak))
2727
const board_info_t g_board_info = {
2828
.info_version = kBoardInfoVersion,
2929
.board_id = "0000",

source/target/target_board.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @file target_board.h
3-
* @brief
3+
* @brief
44
*
55
* DAPLink Interface Firmware
66
* Copyright (c) 2018-2019, ARM Limited, All Rights Reserved
@@ -25,7 +25,7 @@
2525
#include <stdint.h>
2626
#include "target_config.h"
2727
#include "target_reset.h"
28-
#include "virtual_fs.h"
28+
#include "virtual_fs.h"
2929

3030
//! @brief Current board info version.
3131
//!
@@ -40,19 +40,19 @@ enum {
4040
kEnableUnderResetConnect = 1<<1, /*!< Enable under reset connection when enabling debug mode */
4141
};
4242

43-
typedef struct __attribute__((__packed__)) board_info {
43+
typedef struct __attribute__((__packed__)) board_info {
4444
uint16_t info_version; /*!< Version number of the board info */
4545
uint16_t family_id; /*!< Use to select or identify target family from defined target family or custom ones */
4646
char board_id[5]; /*!< 4-char board ID plus null terminator */
47-
uint8_t _padding[3];
47+
uint8_t _padding[3];
4848
uint32_t flags; /*!< Combination of kEnablePageErase and kEnableUnderResetConnect */
49-
target_cfg_t *target_cfg; /*!< Specific chip configuration for the target and enables MSD when non-NULL */
50-
51-
// fields used by MSD
49+
target_cfg_t *target_cfg; /*!< Specific chip configuration for the target and enables MSD when non-NULL */
50+
51+
// fields used by MSD
5252
vfs_filename_t daplink_url_name; /*!< Customize the URL file name */
5353
vfs_filename_t daplink_drive_name; /*!< Customize the MSD DAPLink drive name */
5454
char daplink_target_url[64]; /*!< Customize the target url in DETAILS.TXT */
55-
55+
5656
// some specific board initilization
5757
void (*prerun_board_config)(void); /*!< Specific board debug/ID related initialization */
5858
void (*swd_set_target_reset)(uint8_t asserted); /*!< Boards can customize how to send reset to the target precedence over target family */

source/target/target_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @file target_config.h
3-
* @brief
3+
* @brief
44
*
55
* DAPLink Interface Firmware
66
* Copyright (c) 2009-2019, ARM Limited, All Rights Reserved
@@ -24,7 +24,7 @@
2424

2525
#include "stddef.h"
2626
#include "stdint.h"
27-
27+
2828
#include "flash_blob.h"
2929
#include "macro.h"
3030

source/target/target_family.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@
2525
#include "target_family.h"
2626
#include "target_board.h"
2727

28-
// Stub families
29-
const target_family_descriptor_t g_hw_reset_family = {
30-
.family_id = kStub_HWReset_FamilyID,
31-
.default_reset_type = kHardwareReset,
32-
};
33-
34-
const target_family_descriptor_t g_sw_vectreset_family = {
35-
.family_id = kStub_SWVectReset_FamilyID,
36-
.default_reset_type = kSoftwareReset,
37-
.soft_reset_type = VECTRESET,
38-
};
39-
40-
const target_family_descriptor_t g_sw_sysresetreq_family = {
41-
.family_id = kStub_SWSysReset_FamilyID,
42-
.default_reset_type = kSoftwareReset,
43-
.soft_reset_type = SYSRESETREQ,
28+
// Stub families
29+
const target_family_descriptor_t g_hw_reset_family = {
30+
.family_id = kStub_HWReset_FamilyID,
31+
.default_reset_type = kHardwareReset,
32+
};
33+
34+
const target_family_descriptor_t g_sw_vectreset_family = {
35+
.family_id = kStub_SWVectReset_FamilyID,
36+
.default_reset_type = kSoftwareReset,
37+
.soft_reset_type = VECTRESET,
38+
};
39+
40+
const target_family_descriptor_t g_sw_sysresetreq_family = {
41+
.family_id = kStub_SWSysReset_FamilyID,
42+
.default_reset_type = kSoftwareReset,
43+
.soft_reset_type = SYSRESETREQ,
4444
};
4545

4646
//Weakly define family
@@ -70,7 +70,7 @@ __attribute__((weak))
7070
const target_family_descriptor_t g_toshiba_tz_family = {0};
7171

7272
__attribute__((weak))
73-
const target_family_descriptor_t *g_families[] = {
73+
const target_family_descriptor_t *g_families[] = {
7474
&g_hw_reset_family,
7575
&g_sw_vectreset_family,
7676
&g_sw_sysresetreq_family,
@@ -86,8 +86,8 @@ const target_family_descriptor_t *g_families[] = {
8686
&g_wiznet_family,
8787
&g_renesas_family,
8888
&g_toshiba_tz_family,
89-
0 // list terminator
90-
};
89+
0 // list terminator
90+
};
9191

9292
__attribute__((weak))
9393
const target_family_descriptor_t *g_target_family = NULL;
@@ -100,15 +100,15 @@ void init_family(void)
100100
if (g_target_family != NULL){ //already set
101101
return;
102102
}
103-
103+
104104
while (g_families[index]!=0) {
105105
if (g_families[index]->family_id && (g_families[index]->family_id == family_id)) {
106106
g_target_family = g_families[index];
107107
break;
108108
}
109109
index++;
110110
}
111-
111+
112112
if(g_target_family == NULL){ //default family
113113
g_target_family = &g_hw_reset_family;
114114
}
@@ -124,7 +124,7 @@ uint8_t target_set_state(TARGET_RESET_STATE state)
124124
if (g_board_info.target_set_state) { //target specific
125125
g_board_info.target_set_state(state);
126126
}
127-
if (g_target_family) {
127+
if (g_target_family) {
128128
if (g_target_family->target_set_state) {
129129
//customize target state
130130
return g_target_family->target_set_state(state);
@@ -140,7 +140,7 @@ uint8_t target_set_state(TARGET_RESET_STATE state)
140140
return swd_set_target_state_sw(state);
141141
}else {
142142
return 1;
143-
}
143+
}
144144
}
145145
}else{
146146
return 0;

source/target/target_family.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @file target_family.h
3-
* @brief
3+
* @brief
44
*
55
* DAPLink Interface Firmware
66
* Copyright (c) 2018-2019, ARM Limited, All Rights Reserved
@@ -28,10 +28,10 @@
2828

2929
#define VENDOR_TO_FAMILY(x, y) (x<<8 | y)
3030

31-
typedef enum _reset_type {
32-
kHardwareReset=1,
33-
kSoftwareReset,
34-
} reset_type_t;
31+
typedef enum _reset_type {
32+
kHardwareReset = 1,
33+
kSoftwareReset,
34+
} reset_type_t;
3535

3636
enum _vendor_ids {
3737
kStub_VendorID = 0,
@@ -61,10 +61,10 @@ typedef enum _family_id {
6161
kWiznet_W7500_FamilyID = VENDOR_TO_FAMILY(kWiznet_VendorID, 1),
6262
kRenesas_FamilyID = VENDOR_TO_FAMILY(kRenesas_VendorID, 1),
6363
} family_id_t;
64-
65-
typedef struct target_family_descriptor {
66-
uint16_t family_id; /*!< Use to select or identify target family from defined target family or custom ones */
67-
reset_type_t default_reset_type; /*!< Target family can select predefined reset from kHardwareReset and kSoftwareReset */
64+
65+
typedef struct target_family_descriptor {
66+
uint16_t family_id; /*!< Use to select or identify target family from defined target family or custom ones */
67+
reset_type_t default_reset_type; /*!< Target family can select predefined reset from kHardwareReset and kSoftwareReset */
6868
uint32_t soft_reset_type; /*!< Families can override software reset type to VECTRESET or SYSRESETREQ */
6969
void (*target_before_init_debug)(void); /*!< Target dependant function before debug initialization */
7070
void (*prerun_target_config)(void); /*!< Target specific initialization */

0 commit comments

Comments
 (0)