Skip to content

Commit 19ee46b

Browse files
committed
fix redfinition warning in clang for pcie
was reusing the ssd_config definition in two files Signed-off-by: Kieran Levin <ktl@frame.work>
1 parent 8fab2d8 commit 19ee46b

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

pcie.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <config_definition.h>
22
#include <ssd.h>
33

4-
struct default_ssd_cfg pcie_accessory_cfg = {
4+
struct default_pcie_cfg pcie_accessory_cfg = {
55
.descriptor = {
66
.magic = {0x32, 0xac, 0x00, 0x00},
77
.length = sizeof(struct gpu_cfg_descriptor),
@@ -11,7 +11,7 @@ struct default_ssd_cfg pcie_accessory_cfg = {
1111
.hardware_revision = 0,
1212
.serial = {'F', 'R', 'A', 'P', 'C', 'I', 'E', '0', '0', '0',
1313
'0', '0', '0', 'T', 'E', 'S', 'T', '8', '\0', '\0'},
14-
.descriptor_length = sizeof(struct default_ssd_cfg) - sizeof(struct gpu_cfg_descriptor),
14+
.descriptor_length = sizeof(struct default_pcie_cfg) - sizeof(struct gpu_cfg_descriptor),
1515
.descriptor_crc32 = 0,
1616
.crc32 = 0
1717
},

pcie.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <gpu_cfg_generator.h>
55

66

7-
struct default_ssd_cfg {
7+
struct default_pcie_cfg {
88
struct gpu_cfg_descriptor descriptor;
99

1010
struct gpu_block_header hdr0;
@@ -32,7 +32,7 @@ struct default_ssd_cfg {
3232
} __packed;
3333

3434

35-
extern struct default_ssd_cfg pcie_accessory_cfg;
35+
extern struct default_pcie_cfg pcie_accessory_cfg;
3636

3737

3838
#endif /* __PCIE_H */

0 commit comments

Comments
 (0)