scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-09 17:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Sort console commands at build time"

Browse Source
This commit is contained in:
Gerrit
2012-05-15 09:18:05 -07:00
committed by Gerrit Code Review
parent be7b5b44a3 33b03d5a39
commit 512ff9b95e
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/console.c
View File

@@ -227,36 +227,19 @@ void console_task(void)
static int command_help(int argc, char **argv)
{
const int ncmds = __cmds_end - __cmds;
int i, j, cols, rows;
unsigned char indices[ncmds];
/* Initialize the index. */
for (i = 0; i < ncmds; i++)
indices[i] = i;
/* Bubble sort commands by name. */
for (i = 0; i < (ncmds - 1); i++) {
for (j = i + 1; j < ncmds; j++) {
if (strcasecmp(__cmds[indices[i]].name,
__cmds[indices[j]].name) > 0) {
int tmp = indices[j];
indices[j] = indices[i];
indices[i] = tmp;
}
}
}
const int cols = 5; /* printing in five columns */
const int rows = (ncmds + cols - 1) / cols;
int i, j;
ccputs("Known commands:\n");
cols = 5; /* printing in five columns */
rows = (ncmds + 1) / cols;
for (i = 0; i < rows; i++) {
ccputs(" ");
for (j = 0; j < cols; j++) {
int index = j * rows + i;
if (index >= ncmds)
break;
ccprintf("%-15s", __cmds[indices[index]].name);
ccprintf("%-15s", __cmds[index].name);
}
ccputs("\n");
cflush();

2
core/cortex-m/ec.lds.S
View File

@@ -38,7 +38,7 @@ SECTIONS
. = ALIGN(4);
__cmds = .;
*(.rodata.cmds)
*(SORT(.rodata.cmds*))
__cmds_end = .;
. = ALIGN(4);

2
include/console.h
View File

@@ -83,7 +83,7 @@ void console_has_input(void);
#define DECLARE_CONSOLE_COMMAND(name, routine) \
static const char __con_cmd_label_##name[] = #name; \
const struct console_command __con_cmd_##name \
__attribute__((section(".rodata.cmds"))) \
__attribute__((section(".rodata.cmds." #name))) \
= {__con_cmd_label_##name, routine}
#endif /* __CROS_EC_CONSOLE_H */