Skip to content

Commit f0b1860

Browse files
pelwellpelwell
committed
dtmerge: Convert TABs to spaces
This is a cosmetic change to replace the remaining TABs with 8 spaces. Signed-off-by: Phil Elwell <[email protected]>
1 parent 2b322bc commit f0b1860

File tree

3 files changed

+197
-197
lines changed

3 files changed

+197
-197
lines changed

‎dtmerge/dtmerge.c

Lines changed: 106 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@ int main(int argc, char **argv)
6161

6262
while ((argn < argc) && (argv[argn][0] == '-'))
6363
{
64-
const char *arg = argv[argn++];
65-
if ((strcmp(arg, "-d") == 0) ||
66-
(strcmp(arg, "--debug") == 0))
67-
dtoverlay_enable_debug(1);
68-
else if ((strcmp(arg, "-h") == 0) ||
69-
(strcmp(arg, "--help") == 0))
70-
usage();
71-
else
72-
{
73-
printf("* Unknown option '%s'\n", arg);
74-
usage();
75-
}
64+
const char *arg = argv[argn++];
65+
if ((strcmp(arg, "-d") == 0) ||
66+
(strcmp(arg, "--debug") == 0))
67+
dtoverlay_enable_debug(1);
68+
else if ((strcmp(arg, "-h") == 0) ||
69+
(strcmp(arg, "--help") == 0))
70+
usage();
71+
else
72+
{
73+
printf("* Unknown option '%s'\n", arg);
74+
usage();
75+
}
7676
}
7777

7878
if (argc < (argn + 3))
7979
{
80-
usage();
80+
usage();
8181
}
8282

8383
base_file = argv[argn++];
@@ -87,135 +87,135 @@ int main(int argc, char **argv)
8787
base_dtb = dtoverlay_load_dtb(base_file, max_dtb_size);
8888
if (!base_dtb)
8989
{
90-
printf("* failed to load '%s'\n", base_file);
91-
return -1;
90+
printf("* failed to load '%s'\n", base_file);
91+
return -1;
9292
}
9393

9494
if (strnlen(overlay_file, DTOVERLAY_MAX_PATH) == DTOVERLAY_MAX_PATH)
9595
{
96-
printf("* overlay filename too long\n");
97-
return -1;
96+
printf("* overlay filename too long\n");
97+
return -1;
9898
}
9999

100100
overlay_dir = strdup(overlay_file);
101101
p = strrchr(overlay_dir, '/');
102102
if (p)
103-
*p = 0;
103+
*p = 0;
104104
else
105-
overlay_dir = ".";
105+
overlay_dir = ".";
106106

107107
compatible = dtoverlay_get_property(base_dtb,
108-
dtoverlay_find_node(base_dtb, "/", 1),
109-
"compatible", &compatible_len);
108+
dtoverlay_find_node(base_dtb, "/", 1),
109+
"compatible", &compatible_len);
110110
dtoverlay_init_map(overlay_dir, compatible, compatible_len);
111111

112112
if (!dtoverlay_get_alias(base_dtb, "i2c"))
113113
{
114-
err = dtoverlay_set_synonym(base_dtb, "i2c_arm", "i2c0");
115-
err = dtoverlay_set_synonym(base_dtb, "i2c_vc", "i2c1");
116-
err = dtoverlay_set_synonym(base_dtb, "i2c_baudrate", "i2c0_baudrate");
117-
err = dtoverlay_set_synonym(base_dtb, "i2c_arm_baudrate", "i2c0_baudrate");
118-
err = dtoverlay_set_synonym(base_dtb, "i2c_vc_baudrate", "i2c1_baudrate");
114+
err = dtoverlay_set_synonym(base_dtb, "i2c_arm", "i2c0");
115+
err = dtoverlay_set_synonym(base_dtb, "i2c_vc", "i2c1");
116+
err = dtoverlay_set_synonym(base_dtb, "i2c_baudrate", "i2c0_baudrate");
117+
err = dtoverlay_set_synonym(base_dtb, "i2c_arm_baudrate", "i2c0_baudrate");
118+
err = dtoverlay_set_synonym(base_dtb, "i2c_vc_baudrate", "i2c1_baudrate");
119119
};
120120

121121
if (strcmp(overlay_file, "-") == 0)
122122
{
123-
overlay_dtb = base_dtb;
123+
overlay_dtb = base_dtb;
124124
}
125125
else
126126
{
127-
char new_file[DTOVERLAY_MAX_PATH];
128-
char *overlay_name;
129-
const char *new_name;
130-
char *p;
131-
int len;
132-
133-
strcpy(new_file, overlay_file);
134-
overlay_name = strrchr(new_file, '/');
135-
if (overlay_name)
136-
overlay_name++;
137-
else
138-
overlay_name = new_file;
139-
p = strrchr(overlay_name, '.');
140-
if (p)
141-
*p = 0;
142-
new_name = dtoverlay_remap_overlay(overlay_name);
143-
if (new_name)
144-
{
145-
if (strcmp(overlay_name, new_name))
146-
dtoverlay_debug("mapped overlay '%s' to '%s'", overlay_name, new_name);
147-
148-
len = strlen(new_name);
149-
memmove(overlay_name, new_name, len);
150-
strcpy(overlay_name + len, ".dtbo");
151-
152-
overlay_dtb = dtoverlay_load_dtb(new_file, max_dtb_size);
153-
if (overlay_dtb)
154-
err = dtoverlay_fixup_overlay(base_dtb, overlay_dtb);
155-
else
156-
err = -1;
157-
}
158-
else
159-
{
160-
overlay_dtb = NULL;
161-
err = -2;
162-
}
127+
char new_file[DTOVERLAY_MAX_PATH];
128+
char *overlay_name;
129+
const char *new_name;
130+
char *p;
131+
int len;
132+
133+
strcpy(new_file, overlay_file);
134+
overlay_name = strrchr(new_file, '/');
135+
if (overlay_name)
136+
overlay_name++;
137+
else
138+
overlay_name = new_file;
139+
p = strrchr(overlay_name, '.');
140+
if (p)
141+
*p = 0;
142+
new_name = dtoverlay_remap_overlay(overlay_name);
143+
if (new_name)
144+
{
145+
if (strcmp(overlay_name, new_name))
146+
dtoverlay_debug("mapped overlay '%s' to '%s'", overlay_name, new_name);
147+
148+
len = strlen(new_name);
149+
memmove(overlay_name, new_name, len);
150+
strcpy(overlay_name + len, ".dtbo");
151+
152+
overlay_dtb = dtoverlay_load_dtb(new_file, max_dtb_size);
153+
if (overlay_dtb)
154+
err = dtoverlay_fixup_overlay(base_dtb, overlay_dtb);
155+
else
156+
err = -1;
157+
}
158+
else
159+
{
160+
overlay_dtb = NULL;
161+
err = -2;
162+
}
163163
}
164164

165165
while (!err && (argn < argc))
166166
{
167-
char *param_name = argv[argn++];
168-
char *param_value = param_name + strcspn(param_name, "=");
169-
const void *override_data;
170-
int data_len;
171-
172-
if (*param_value == '=')
173-
{
174-
*(param_value++) = '\0';
175-
}
176-
else
177-
{
178-
/* This isn't a well-formed parameter assignment, but it can be
179-
treated as an assignment of true. */
180-
param_value = "true";
181-
}
182-
183-
override_data = dtoverlay_find_override(overlay_dtb, param_name,
184-
&data_len);
185-
if (override_data)
186-
{
187-
err = dtoverlay_apply_override(overlay_dtb, param_name,
188-
override_data, data_len,
189-
param_value);
190-
}
191-
else
192-
{
193-
override_data = dtoverlay_find_override(base_dtb, param_name, &data_len);
194-
if (override_data)
195-
{
196-
err = dtoverlay_apply_override(base_dtb, param_name,
197-
override_data, data_len,
198-
param_value);
199-
}
200-
else
201-
{
202-
printf("* unknown param '%s'\n", param_name);
203-
err = data_len;
204-
}
205-
}
167+
char *param_name = argv[argn++];
168+
char *param_value = param_name + strcspn(param_name, "=");
169+
const void *override_data;
170+
int data_len;
171+
172+
if (*param_value == '=')
173+
{
174+
*(param_value++) = '\0';
175+
}
176+
else
177+
{
178+
/* This isn't a well-formed parameter assignment, but it can be
179+
treated as an assignment of true. */
180+
param_value = "true";
181+
}
182+
183+
override_data = dtoverlay_find_override(overlay_dtb, param_name,
184+
&data_len);
185+
if (override_data)
186+
{
187+
err = dtoverlay_apply_override(overlay_dtb, param_name,
188+
override_data, data_len,
189+
param_value);
190+
}
191+
else
192+
{
193+
override_data = dtoverlay_find_override(base_dtb, param_name, &data_len);
194+
if (override_data)
195+
{
196+
err = dtoverlay_apply_override(base_dtb, param_name,
197+
override_data, data_len,
198+
param_value);
199+
}
200+
else
201+
{
202+
printf("* unknown param '%s'\n", param_name);
203+
err = data_len;
204+
}
205+
}
206206
}
207207

208208
if (!err && (overlay_dtb != base_dtb))
209209
{
210-
err = dtoverlay_merge_overlay(base_dtb, overlay_dtb);
210+
err = dtoverlay_merge_overlay(base_dtb, overlay_dtb);
211211

212-
dtoverlay_free_dtb(overlay_dtb);
212+
dtoverlay_free_dtb(overlay_dtb);
213213
}
214214

215215
if (!err)
216216
{
217-
dtoverlay_pack_dtb(base_dtb);
218-
err = dtoverlay_save_dtb(base_dtb, merged_file);
217+
dtoverlay_pack_dtb(base_dtb);
218+
err = dtoverlay_save_dtb(base_dtb, merged_file);
219219
}
220220

221221
dtoverlay_free_dtb(base_dtb);

0 commit comments

Comments
 (0)