wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 1 | /* |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 2 | * (C) Copyright 2002-2007 |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 3 | * Detlev Zundel, DENX Software Engineering, dzu@denx.de. |
| 4 | * |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 5 | * Code used from linux/kernel/printk.c |
| 6 | * Copyright (C) 1991, 1992 Linus Torvalds |
| 7 | * |
Wolfgang Denk | d79de1d | 2013-07-08 09:37:19 +0200 | [diff] [blame] | 8 | * SPDX-License-Identifier: GPL-2.0+ |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 9 | * |
| 10 | * Comments: |
| 11 | * |
| 12 | * After relocating the code, the environment variable "loglevel" is |
| 13 | * copied to console_loglevel. The functionality is similar to the |
| 14 | * handling in the Linux kernel, i.e. messages logged with a priority |
| 15 | * less than console_loglevel are also output to stdout. |
| 16 | * |
| 17 | * If you want messages with the default level (e.g. POST messages) to |
| 18 | * appear on stdout also, make sure the environment variable |
| 19 | * "loglevel" is set at boot time to a number higher than |
| 20 | * default_message_loglevel below. |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 21 | */ |
| 22 | |
| 23 | /* |
| 24 | * Logbuffer handling routines |
| 25 | */ |
| 26 | |
| 27 | #include <common.h> |
| 28 | #include <command.h> |
Jean-Christophe PLAGNIOL-VILLARD | 2a7a031 | 2009-05-16 12:14:54 +0200 | [diff] [blame] | 29 | #include <stdio_dev.h> |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 30 | #include <post.h> |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 31 | #include <logbuff.h> |
| 32 | |
Wolfgang Denk | 6405a15 | 2006-03-31 18:32:53 +0200 | [diff] [blame] | 33 | DECLARE_GLOBAL_DATA_PTR; |
| 34 | |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 35 | /* Local prototypes */ |
Simon Glass | 0d1e1f7 | 2014-07-23 06:54:59 -0600 | [diff] [blame] | 36 | static void logbuff_putc(struct stdio_dev *dev, const char c); |
| 37 | static void logbuff_puts(struct stdio_dev *dev, const char *s); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 38 | static int logbuff_printk(const char *line); |
| 39 | |
| 40 | static char buf[1024]; |
| 41 | |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 42 | /* This combination will not print messages with the default loglevel */ |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 43 | static unsigned console_loglevel = 3; |
| 44 | static unsigned default_message_loglevel = 4; |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 45 | static unsigned log_version = 1; |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 46 | #ifdef CONFIG_ALT_LB_ADDR |
| 47 | static volatile logbuff_t *log; |
| 48 | #else |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 49 | static logbuff_t *log; |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 50 | #endif |
| 51 | static char *lbuf; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 52 | |
Marian Balakowicz | 902ce70 | 2008-05-13 15:53:29 +0200 | [diff] [blame] | 53 | unsigned long __logbuffer_base(void) |
| 54 | { |
York Sun | 863e8d8 | 2014-02-11 11:57:26 -0800 | [diff] [blame] | 55 | return CONFIG_SYS_SDRAM_BASE + get_effective_memsize() - LOGBUFF_LEN; |
Marian Balakowicz | 902ce70 | 2008-05-13 15:53:29 +0200 | [diff] [blame] | 56 | } |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 57 | unsigned long logbuffer_base(void) |
| 58 | __attribute__((weak, alias("__logbuffer_base"))); |
Marian Balakowicz | 902ce70 | 2008-05-13 15:53:29 +0200 | [diff] [blame] | 59 | |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 60 | void logbuff_init_ptrs(void) |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 61 | { |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 62 | unsigned long tag, post_word; |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 63 | char *s; |
| 64 | |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 65 | #ifdef CONFIG_ALT_LB_ADDR |
| 66 | log = (logbuff_t *)CONFIG_ALT_LH_ADDR; |
| 67 | lbuf = (char *)CONFIG_ALT_LB_ADDR; |
| 68 | #else |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 69 | log = (logbuff_t *)(logbuffer_base()) - 1; |
Jean-Christophe PLAGNIOL-VILLARD | 531ad56 | 2008-04-02 08:03:57 +0200 | [diff] [blame] | 70 | lbuf = (char *)log->buf; |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 71 | #endif |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 72 | |
| 73 | /* Set up log version */ |
| 74 | if ((s = getenv ("logversion")) != NULL) |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 75 | log_version = (int)simple_strtoul(s, NULL, 10); |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 76 | |
| 77 | if (log_version == 2) |
| 78 | tag = log->v2.tag; |
| 79 | else |
| 80 | tag = log->v1.tag; |
wdenk | 41bea11 | 2003-07-15 21:08:26 +0000 | [diff] [blame] | 81 | post_word = post_word_load(); |
wdenk | d9fce81 | 2003-06-28 17:24:46 +0000 | [diff] [blame] | 82 | #ifdef CONFIG_POST |
| 83 | /* The post routines have setup the word so we can simply test it */ |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 84 | if (tag != LOGBUFF_MAGIC || (post_word & POST_COLDBOOT)) |
| 85 | logbuff_reset(); |
wdenk | d9fce81 | 2003-06-28 17:24:46 +0000 | [diff] [blame] | 86 | #else |
| 87 | /* No post routines, so we do our own checking */ |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 88 | if (tag != LOGBUFF_MAGIC || post_word != LOGBUFF_MAGIC) { |
| 89 | logbuff_reset (); |
wdenk | d9fce81 | 2003-06-28 17:24:46 +0000 | [diff] [blame] | 90 | post_word_store (LOGBUFF_MAGIC); |
Wolfgang Denk | 70df7bc | 2007-06-22 23:59:00 +0200 | [diff] [blame] | 91 | } |
wdenk | d9fce81 | 2003-06-28 17:24:46 +0000 | [diff] [blame] | 92 | #endif |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 93 | if (log_version == 2 && (long)log->v2.start > (long)log->v2.con) |
| 94 | log->v2.start = log->v2.con; |
| 95 | |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 96 | /* Initialize default loglevel if present */ |
| 97 | if ((s = getenv ("loglevel")) != NULL) |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 98 | console_loglevel = (int)simple_strtoul(s, NULL, 10); |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 99 | |
Yuri Tikhonov | 35d81ce | 2008-05-08 15:46:42 +0200 | [diff] [blame] | 100 | gd->flags |= GD_FLG_LOGINIT; |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 101 | } |
| 102 | |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 103 | void logbuff_reset(void) |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 104 | { |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 105 | #ifndef CONFIG_ALT_LB_ADDR |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 106 | memset(log, 0, sizeof(logbuff_t)); |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 107 | #endif |
| 108 | if (log_version == 2) { |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 109 | log->v2.tag = LOGBUFF_MAGIC; |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 110 | #ifdef CONFIG_ALT_LB_ADDR |
| 111 | log->v2.start = 0; |
| 112 | log->v2.con = 0; |
| 113 | log->v2.end = 0; |
| 114 | log->v2.chars = 0; |
| 115 | #endif |
| 116 | } else { |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 117 | log->v1.tag = LOGBUFF_MAGIC; |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 118 | #ifdef CONFIG_ALT_LB_ADDR |
| 119 | log->v1.dummy = 0; |
| 120 | log->v1.start = 0; |
| 121 | log->v1.size = 0; |
| 122 | log->v1.chars = 0; |
| 123 | #endif |
| 124 | } |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 125 | } |
| 126 | |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 127 | int drv_logbuff_init(void) |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 128 | { |
Jean-Christophe PLAGNIOL-VILLARD | 2a7a031 | 2009-05-16 12:14:54 +0200 | [diff] [blame] | 129 | struct stdio_dev logdev; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 130 | int rc; |
| 131 | |
| 132 | /* Device initialization */ |
| 133 | memset (&logdev, 0, sizeof (logdev)); |
| 134 | |
| 135 | strcpy (logdev.name, "logbuff"); |
| 136 | logdev.ext = 0; /* No extensions */ |
| 137 | logdev.flags = DEV_FLAGS_OUTPUT; /* Output only */ |
| 138 | logdev.putc = logbuff_putc; /* 'putc' function */ |
| 139 | logdev.puts = logbuff_puts; /* 'puts' function */ |
| 140 | |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 141 | rc = stdio_register(&logdev); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 142 | |
| 143 | return (rc == 0) ? 1 : rc; |
| 144 | } |
| 145 | |
Simon Glass | 0d1e1f7 | 2014-07-23 06:54:59 -0600 | [diff] [blame] | 146 | static void logbuff_putc(struct stdio_dev *dev, const char c) |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 147 | { |
| 148 | char buf[2]; |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 149 | buf[0] = c; |
| 150 | buf[1] = '\0'; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 151 | logbuff_printk(buf); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 152 | } |
| 153 | |
Simon Glass | 0d1e1f7 | 2014-07-23 06:54:59 -0600 | [diff] [blame] | 154 | static void logbuff_puts(struct stdio_dev *dev, const char *s) |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 155 | { |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 156 | logbuff_printk (s); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 157 | } |
| 158 | |
| 159 | void logbuff_log(char *msg) |
| 160 | { |
Yuri Tikhonov | 35d81ce | 2008-05-08 15:46:42 +0200 | [diff] [blame] | 161 | if ((gd->flags & GD_FLG_LOGINIT)) { |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 162 | logbuff_printk(msg); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 163 | } else { |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 164 | /* |
| 165 | * Can happen only for pre-relocated errors as logging |
| 166 | * at that stage should be disabled |
| 167 | */ |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 168 | puts (msg); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 169 | } |
| 170 | } |
| 171 | |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 172 | /* |
| 173 | * Subroutine: do_log |
| 174 | * |
| 175 | * Description: Handler for 'log' command.. |
| 176 | * |
| 177 | * Inputs: argv[1] contains the subcommand |
| 178 | * |
| 179 | * Return: None |
| 180 | * |
| 181 | */ |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 182 | int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 183 | { |
Simon Glass | 0d1e1f7 | 2014-07-23 06:54:59 -0600 | [diff] [blame] | 184 | struct stdio_dev *sdev = NULL; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 185 | char *s; |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 186 | unsigned long i, start, size; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 187 | |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 188 | if (strcmp(argv[1], "append") == 0) { |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 189 | /* Log concatenation of all arguments separated by spaces */ |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 190 | for (i = 2; i < argc; i++) { |
| 191 | logbuff_printk(argv[i]); |
Simon Glass | 0d1e1f7 | 2014-07-23 06:54:59 -0600 | [diff] [blame] | 192 | logbuff_putc(sdev, (i < argc - 1) ? ' ' : '\n'); |
wdenk | 9dfa8d1 | 2002-12-08 09:53:23 +0000 | [diff] [blame] | 193 | } |
| 194 | return 0; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 195 | } |
| 196 | |
| 197 | switch (argc) { |
| 198 | |
| 199 | case 2: |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 200 | if (strcmp(argv[1], "show") == 0) { |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 201 | if (log_version == 2) { |
| 202 | start = log->v2.start; |
| 203 | size = log->v2.end - log->v2.start; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 204 | } else { |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 205 | start = log->v1.start; |
| 206 | size = log->v1.size; |
| 207 | } |
Heiko Schocher | e5f7869 | 2012-02-16 01:02:21 +0000 | [diff] [blame] | 208 | if (size > LOGBUFF_LEN) |
| 209 | size = LOGBUFF_LEN; |
| 210 | for (i = 0; i < size; i++) { |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 211 | s = lbuf + ((start + i) & LOGBUFF_MASK); |
| 212 | putc(*s); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 213 | } |
| 214 | return 0; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 215 | } else if (strcmp(argv[1], "reset") == 0) { |
| 216 | logbuff_reset(); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 217 | return 0; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 218 | } else if (strcmp(argv[1], "info") == 0) { |
| 219 | printf("Logbuffer at %08lx\n", (unsigned long)lbuf); |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 220 | if (log_version == 2) { |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 221 | printf("log_start = %08lx\n", |
| 222 | log->v2.start); |
| 223 | printf("log_end = %08lx\n", log->v2.end); |
Heiko Schocher | 650ebc0 | 2012-02-14 22:21:07 +0000 | [diff] [blame] | 224 | printf("log_con = %08lx\n", log->v2.con); |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 225 | printf("logged_chars = %08lx\n", |
| 226 | log->v2.chars); |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 227 | } |
| 228 | else { |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 229 | printf("log_start = %08lx\n", |
| 230 | log->v1.start); |
| 231 | printf("log_size = %08lx\n", |
| 232 | log->v1.size); |
| 233 | printf("logged_chars = %08lx\n", |
| 234 | log->v1.chars); |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 235 | } |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 236 | return 0; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 237 | } |
Simon Glass | a06dfc7 | 2011-12-10 08:44:01 +0000 | [diff] [blame] | 238 | return CMD_RET_USAGE; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 239 | |
| 240 | default: |
Simon Glass | a06dfc7 | 2011-12-10 08:44:01 +0000 | [diff] [blame] | 241 | return CMD_RET_USAGE; |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 242 | } |
| 243 | } |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 244 | |
wdenk | f287a24 | 2003-07-01 21:06:45 +0000 | [diff] [blame] | 245 | U_BOOT_CMD( |
| 246 | log, 255, 1, do_log, |
Peter Tyser | dfb72b8 | 2009-01-27 18:03:12 -0600 | [diff] [blame] | 247 | "manipulate logbuffer", |
wdenk | b9bbd24 | 2003-06-30 16:24:52 +0000 | [diff] [blame] | 248 | "info - show pointer details\n" |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 249 | "log reset - clear contents\n" |
| 250 | "log show - show contents\n" |
Wolfgang Denk | c54781c | 2009-05-24 17:06:54 +0200 | [diff] [blame] | 251 | "log append <msg> - append <msg> to the logbuffer" |
wdenk | 57b2d80 | 2003-06-27 21:31:46 +0000 | [diff] [blame] | 252 | ); |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 253 | |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 254 | static int logbuff_printk(const char *line) |
| 255 | { |
| 256 | int i; |
| 257 | char *msg, *p, *buf_end; |
| 258 | int line_feed; |
| 259 | static signed char msg_level = -1; |
| 260 | |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 261 | strcpy(buf + 3, line); |
| 262 | i = strlen(line); |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 263 | buf_end = buf + 3 + i; |
| 264 | for (p = buf + 3; p < buf_end; p++) { |
| 265 | msg = p; |
| 266 | if (msg_level < 0) { |
| 267 | if ( |
| 268 | p[0] != '<' || |
| 269 | p[1] < '0' || |
| 270 | p[1] > '7' || |
| 271 | p[2] != '>' |
| 272 | ) { |
| 273 | p -= 3; |
| 274 | p[0] = '<'; |
| 275 | p[1] = default_message_loglevel + '0'; |
| 276 | p[2] = '>'; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 277 | } else { |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 278 | msg += 3; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 279 | } |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 280 | msg_level = p[1] - '0'; |
| 281 | } |
| 282 | line_feed = 0; |
| 283 | for (; p < buf_end; p++) { |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 284 | if (log_version == 2) { |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 285 | lbuf[log->v2.end & LOGBUFF_MASK] = *p; |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 286 | log->v2.end++; |
| 287 | if (log->v2.end - log->v2.start > LOGBUFF_LEN) |
| 288 | log->v2.start++; |
| 289 | log->v2.chars++; |
Heiko Schocher | 3102012 | 2012-02-14 22:21:06 +0000 | [diff] [blame] | 290 | } else { |
Yuri Tikhonov | fe1d91b | 2008-02-06 18:48:36 +0100 | [diff] [blame] | 291 | lbuf[(log->v1.start + log->v1.size) & |
Igor Lisitsin | 93470f2 | 2007-04-18 14:55:19 +0400 | [diff] [blame] | 292 | LOGBUFF_MASK] = *p; |
| 293 | if (log->v1.size < LOGBUFF_LEN) |
| 294 | log->v1.size++; |
| 295 | else |
| 296 | log->v1.start++; |
| 297 | log->v1.chars++; |
| 298 | } |
wdenk | 56f94be | 2002-11-05 16:35:14 +0000 | [diff] [blame] | 299 | if (*p == '\n') { |
| 300 | line_feed = 1; |
| 301 | break; |
| 302 | } |
| 303 | } |
| 304 | if (msg_level < console_loglevel) { |
| 305 | printf("%s", msg); |
| 306 | } |
| 307 | if (line_feed) |
| 308 | msg_level = -1; |
| 309 | } |
| 310 | return i; |
| 311 | } |