projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IDE: Fix complaints about strict aliasing in cmd_ide.c
[oweals/u-boot.git]
/
common
/
cmd_log.c
diff --git
a/common/cmd_log.c
b/common/cmd_log.c
index 8e04941d6106dddc5cce24901cdcd7f792907021..0e89357e5dcd003956a6678b9a590f47126a265f 100644
(file)
--- a/
common/cmd_log.c
+++ b/
common/cmd_log.c
@@
-42,7
+42,7
@@
#include <common.h>
#include <command.h>
#include <common.h>
#include <command.h>
-#include <
devices
.h>
+#include <
stdio_dev
.h>
#include <post.h>
#include <logbuff.h>
#include <post.h>
#include <logbuff.h>
@@
-68,7
+68,7
@@
static char *lbuf;
unsigned long __logbuffer_base(void)
{
unsigned long __logbuffer_base(void)
{
- return C
FG
_SDRAM_BASE + gd->bd->bi_memsize - LOGBUFF_LEN;
+ return C
ONFIG_SYS
_SDRAM_BASE + gd->bd->bi_memsize - LOGBUFF_LEN;
}
unsigned long logbuffer_base (void) __attribute__((weak, alias("__logbuffer_base")));
}
unsigned long logbuffer_base (void) __attribute__((weak, alias("__logbuffer_base")));
@@
-113,7
+113,7
@@
void logbuff_init_ptrs (void)
if ((s = getenv ("loglevel")) != NULL)
console_loglevel = (int)simple_strtoul (s, NULL, 10);
if ((s = getenv ("loglevel")) != NULL)
console_loglevel = (int)simple_strtoul (s, NULL, 10);
- gd->
post_log_word |= LOGBUFF_INITIALIZED
;
+ gd->
flags |= GD_FLG_LOGINIT
;
}
void logbuff_reset (void)
}
void logbuff_reset (void)
@@
-142,7
+142,7
@@
void logbuff_reset (void)
int drv_logbuff_init (void)
{
int drv_logbuff_init (void)
{
-
device_t
logdev;
+
struct stdio_dev
logdev;
int rc;
/* Device initialization */
int rc;
/* Device initialization */
@@
-154,7
+154,7
@@
int drv_logbuff_init (void)
logdev.putc = logbuff_putc; /* 'putc' function */
logdev.puts = logbuff_puts; /* 'puts' function */
logdev.putc = logbuff_putc; /* 'putc' function */
logdev.puts = logbuff_puts; /* 'puts' function */
- rc =
device
_register (&logdev);
+ rc =
stdio
_register (&logdev);
return (rc == 0) ? 1 : rc;
}
return (rc == 0) ? 1 : rc;
}
@@
-174,7
+174,7
@@
static void logbuff_puts (const char *s)
void logbuff_log(char *msg)
{
void logbuff_log(char *msg)
{
- if ((gd->
post_log_word & LOGBUFF_INITIALIZED
)) {
+ if ((gd->
flags & GD_FLG_LOGINIT
)) {
logbuff_printk (msg);
} else {
/* Can happen only for pre-relocated errors as logging */
logbuff_printk (msg);
} else {
/* Can happen only for pre-relocated errors as logging */
@@
-193,7
+193,7
@@
void logbuff_log(char *msg)
* Return: None
*
*/
* Return: None
*
*/
-int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *
const
argv[])
{
char *s;
unsigned long i, start, size;
{
char *s;
unsigned long i, start, size;
@@
-241,22
+241,20
@@
int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
return 0;
}
}
return 0;
}
- printf ("Usage:\n%s\n", cmdtp->usage);
- return 1;
+ return cmd_usage(cmdtp);
default:
default:
- printf ("Usage:\n%s\n", cmdtp->usage);
- return 1;
+ return cmd_usage(cmdtp);
}
}
U_BOOT_CMD(
log, 255, 1, do_log,
}
}
U_BOOT_CMD(
log, 255, 1, do_log,
- "
log - manipulate logbuffer\n
",
+ "
manipulate logbuffer
",
"info - show pointer details\n"
"log reset - clear contents\n"
"log show - show contents\n"
"info - show pointer details\n"
"log reset - clear contents\n"
"log show - show contents\n"
- "log append <msg> - append <msg> to the logbuffer
\n
"
+ "log append <msg> - append <msg> to the logbuffer"
);
static int logbuff_printk(const char *line)
);
static int logbuff_printk(const char *line)