diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-11-01 10:31:00 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-11-01 15:32:52 +0800 |
commit | 089d0a6eb769d531129a7cd1061493a1a24b4bef (patch) | |
tree | 62e6b58e6a9cd9b19ac9f7a8986b9d01cfe5ec70 /ui | |
parent | 896da834e7126759ef69c33347055c593abedde3 (diff) | |
download | talos-petitboot-089d0a6eb769d531129a7cd1061493a1a24b4bef.tar.gz talos-petitboot-089d0a6eb769d531129a7cd1061493a1a24b4bef.zip |
logging: Clean up debug logs
We have quite a few pb_logs which should be pb_debug. This change moves
developer-specific info to pb_debug.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/common/joystick.c | 2 | ||||
-rw-r--r-- | ui/common/ps3.c | 12 | ||||
-rw-r--r-- | ui/ncurses/nc-cui.c | 8 | ||||
-rw-r--r-- | ui/ncurses/nc-menu.h | 16 | ||||
-rw-r--r-- | ui/ncurses/nc-scr.h | 9 | ||||
-rw-r--r-- | ui/ncurses/ps3-main.c | 2 | ||||
-rw-r--r-- | ui/twin/main-generic.c | 2 | ||||
-rw-r--r-- | ui/twin/pbt-client.c | 8 | ||||
-rw-r--r-- | ui/twin/pbt-scr.c | 4 | ||||
-rw-r--r-- | ui/twin/pbt-scr.h | 4 |
10 files changed, 27 insertions, 40 deletions
diff --git a/ui/common/joystick.c b/ui/common/joystick.c index 94c85fe..4faf8b6 100644 --- a/ui/common/joystick.c +++ b/ui/common/joystick.c @@ -94,7 +94,7 @@ struct pjs *pjs_init(void *ctx, int (*map)(const struct js_event *)) talloc_set_destructor(pjs, pjs_destructor); - pb_log("%s: using %s\n", __func__, dev_name); + pb_debug("%s: using %s\n", __func__, dev_name); return pjs; diff --git a/ui/common/ps3.c b/ui/common/ps3.c index c62a10d..d3ca6d6 100644 --- a/ui/common/ps3.c +++ b/ui/common/ps3.c @@ -141,11 +141,11 @@ int ps3_flash_get_values(struct ps3_flash_values *values) if (!result) values->video_mode = (uint16_t)tmp; - pb_log("%s: default_item: %x\n", __func__, + pb_debug("%s: default_item: %x\n", __func__, (unsigned int)values->default_item); - pb_log("%s: timeout: %u\n", __func__, + pb_debug("%s: timeout: %u\n", __func__, (unsigned int)values->timeout); - pb_log("%s: video_mode: %u\n", __func__, + pb_debug("%s: video_mode: %u\n", __func__, (unsigned int)values->video_mode); fail: return (result || sum) ? -1 : 0; @@ -163,8 +163,8 @@ int ps3_flash_set_values(const struct ps3_flash_values *values) int result; struct ps3_flash_ctx fc; - pb_log("%s: default_item: %u\n", __func__, values->default_item); - pb_log("%s: video_mode: %u\n", __func__, values->video_mode); + pb_debug("%s: default_item: %u\n", __func__, values->default_item); + pb_debug("%s: video_mode: %u\n", __func__, values->video_mode); result = ps3_flash_open(&fc, "r+"); @@ -245,7 +245,7 @@ static int ps3_video_ioctl(int request, unsigned int *mode_id) int ps3_set_video_mode(unsigned int mode_id) { - pb_log("%s: %u\n", __func__, mode_id); + pb_debug("%s: %u\n", __func__, mode_id); return ps3_video_ioctl(PS3FB_IOCTL_SETMODE, &mode_id); } diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index da97fd9..e02c6a6 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -60,7 +60,7 @@ void cui_abort(struct cui *cui) void cui_resize(struct cui *cui) { - pb_log("%s: resizing\n", __func__); + pb_debug("%s: resizing\n", __func__); cui->resize = 1; } @@ -112,7 +112,7 @@ static int cui_boot(struct pmenu_item *item) assert(cui->current == &cui->main->scr); - pb_log("%s: %s\n", __func__, cod->name); + pb_debug("%s: %s\n", __func__, cod->name); nc_scr_status_printf(cui->current, "Booting %s...", cod->name); @@ -302,7 +302,7 @@ static void cui_handle_resize(struct cui *cui) return; } - pb_log("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col); + pb_debug("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col); wclear(cui->current->main_ncw); resize_term(ws.ws_row, ws.ws_col); @@ -331,7 +331,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, ITEM *selected; int result; - pb_log("%s: %p %s\n", __func__, opt, opt->id); + pb_debug("%s: %p %s\n", __func__, opt, opt->id); selected = current_item(cui->main->ncm); diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h index 3b7bc88..4beffb0 100644 --- a/ui/ncurses/nc-menu.h +++ b/ui/ncurses/nc-menu.h @@ -114,26 +114,18 @@ static inline struct pmenu *pmenu_from_scr(struct nc_scr *scr) /* debug routines */ -#if defined(DEBUG) -enum {do_debug = 1}; -#else -enum {do_debug = 0}; -#endif - static inline void pmenu_dump_item(const ITEM *item) { - if (do_debug) - pb_log("%p %s\n", item, (item ? item->name.str : "(null)")); + pb_debug("%p %s\n", item, (item ? item->name.str : "(null)")); } static inline void pmenu_dump_items(ITEM *const *items, unsigned int count) { unsigned int i; - if (do_debug) - for (i = 0; i < count; i++) - pb_log("%u: %p %s\n", i, items[i], - (items[i] ? items[i]->name.str : "(null)")); + for (i = 0; i < count; i++) + pb_debug("%u: %p %s\n", i, items[i], + (items[i] ? items[i]->name.str : "(null)")); } #endif diff --git a/ui/ncurses/nc-scr.h b/ui/ncurses/nc-scr.h index 298aa7d..9f80e65 100644 --- a/ui/ncurses/nc-scr.h +++ b/ui/ncurses/nc-scr.h @@ -34,14 +34,9 @@ # error "Curses header file not found." #endif -#ifdef DEBUG -#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args) +#define DBG(fmt, args...) pb_debug("DBG: " fmt, ## args) #define DBGS(fmt, args...) \ - pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) -#else -#define DBG(fmt, args...) -#define DBGS(fmt, args...) -#endif + pb_debug("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) enum pb_nc_sig { diff --git a/ui/ncurses/ps3-main.c b/ui/ncurses/ps3-main.c index c4a3892..1269549 100644 --- a/ui/ncurses/ps3-main.c +++ b/ui/ncurses/ps3-main.c @@ -275,7 +275,7 @@ static int ps3_boot_cb(struct cui *cui, struct cui_opt_data *cod) int altered_args; char *orig_args; - pb_log("%s: %s\n", __func__, cod->name); + pb_debug("%s: %s\n", __func__, cod->name); assert(ps3->cui->current == &ps3->cui->main->scr); diff --git a/ui/twin/main-generic.c b/ui/twin/main-generic.c index 649ad00..2301e31 100644 --- a/ui/twin/main-generic.c +++ b/ui/twin/main-generic.c @@ -58,7 +58,7 @@ static int edit_preferences_cb(struct pbt_item *item) (void)client; - pb_log("%s: TODO\n", __func__); + pb_debug("%s: TODO\n", __func__); return 0; } diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c index dba6110..21ed524 100644 --- a/ui/twin/pbt-client.c +++ b/ui/twin/pbt-client.c @@ -58,7 +58,7 @@ static int pbt_client_boot(struct pbt_item *item) int result; struct pb_opt_data *opt_data = pbt_opt_data_from_item(item); - pb_log("%s: %s\n", __func__, pbt_item_name(item)); + pb_debug("%s: %s\n", __func__, pbt_item_name(item)); pbt_frame_status_printf(&item->pbt_client->frame, "Booting %s...", pbt_item_name(item)); @@ -88,7 +88,7 @@ static int pbt_device_add(struct device *dev, struct pbt_client *client) struct pbt_quad q; const char *icon_file; - pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id, + pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id, dev->n_options); pb_protocol_dump_device(dev, "", pb_log_get_stream()); @@ -181,7 +181,7 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client) struct pbt_item *next_item; struct pbt_item *i; - pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id, + pb_debug("%s: %p %s: n_options %d\n", __func__, dev, dev->id, dev->n_options); pb_protocol_dump_device(dev, "", pb_log_get_stream()); @@ -245,7 +245,7 @@ static struct discover_client_ops pbt_client_ops = { static void pbt_client_destructor(struct pbt_client *client) { - pb_log("%s\n", __func__); + pb_debug("%s\n", __func__); // move to screen twin_x11_destroy(twin_ctx); talloc_free(client->discover_client); diff --git a/ui/twin/pbt-scr.c b/ui/twin/pbt-scr.c index e093c3c..79f6792 100644 --- a/ui/twin/pbt-scr.c +++ b/ui/twin/pbt-scr.c @@ -361,7 +361,7 @@ static int pbt_twin_waiter_cb(struct pbt_twin_ctx *twin_ctx) static void pbt_scr_destructor(struct pbt_scr *scr) { - pb_log("%s\n", __func__); + pb_debug("%s\n", __func__); twin_x11_destroy(scr->twin_ctx.x11); // FIXME: need cursor cleanup??? @@ -409,7 +409,7 @@ struct pbt_scr *pbt_scr_init(void *talloc_ctx, goto fail_ctx_create; } - pb_log("%s: x11: %p\n", __func__, scr->twin_ctx.x11); + pb_debug("%s: x11: %p\n", __func__, scr->twin_ctx.x11); assert(scr->twin_ctx.x11->screen); scr->tscreen = scr->twin_ctx.x11->screen; diff --git a/ui/twin/pbt-scr.h b/ui/twin/pbt-scr.h index 1198a59..2880ee1 100644 --- a/ui/twin/pbt-scr.h +++ b/ui/twin/pbt-scr.h @@ -33,9 +33,9 @@ # include <libtwin/twin_fbdev.h> #endif -#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args) +#define DBG(fmt, args...) pb_debug("DBG: " fmt, ## args) #define DBGS(fmt, args...) \ - pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) + pb_debug("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) struct pbt_quad { twin_coord_t x; |