From ca162dc94ddfa0865616bd73bc7e94a32c8bd4bf Mon Sep 17 00:00:00 2001 From: dglaude Date: Thu, 17 Jan 2002 20:51:31 +0000 Subject: [PATCH] Rename _?bar and init_?bar stuff to _old_. --- server/drivers/MtxOrb.c | 21 ++++++++++++--------- server/drivers/MtxOrb.h | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/server/drivers/MtxOrb.c b/server/drivers/MtxOrb.c index 03c90f7..eafb923 100644 --- a/server/drivers/MtxOrb.c +++ b/server/drivers/MtxOrb.c @@ -438,13 +438,17 @@ MtxOrb_init (Driver *drvthis, char *args) drvthis->clear = MtxOrb_clear; drvthis->string = MtxOrb_string; drvthis->chr = MtxOrb_chr; - drvthis->old_vbar = MtxOrb_vbar; - drvthis->init_vbar = MtxOrb_init_vbar; - drvthis->old_hbar = MtxOrb_hbar; - drvthis->init_hbar = MtxOrb_init_hbar; drvthis->num = MtxOrb_num; drvthis->init_num = MtxOrb_init_num; +/* Old stuff that are going to be removed */ + drvthis->old_vbar = MtxOrb_old_vbar; + drvthis->init_vbar = MtxOrb_init_old_vbar; + drvthis->old_hbar = MtxOrb_old_hbar; + drvthis->init_hbar = MtxOrb_init_old_hbar; + drvthis->old_icon = MtxOrb_old_icon; +/* Old stuff that are going to be removed */ + drvthis->init = MtxOrb_init; drvthis->close = MtxOrb_close; drvthis->width = MtxOrb_width; @@ -455,7 +459,6 @@ MtxOrb_init (Driver *drvthis, char *args) drvthis->backlight = MtxOrb_backlight; drvthis->output = MtxOrb_output; drvthis->set_char = MtxOrb_set_char; - drvthis->old_icon = MtxOrb_old_icon; drvthis->icon = MtxOrb_icon; @@ -822,7 +825,7 @@ MtxOrb_cursorblink (Driver *drvthis, int on) * Sets up for vertical bars. Call before lcd.vbar() */ MODULE_EXPORT void -MtxOrb_init_vbar (Driver *drvthis) +MtxOrb_init_old_vbar (Driver *drvthis) { } @@ -830,7 +833,7 @@ MtxOrb_init_vbar (Driver *drvthis) * Inits horizontal bars... */ MODULE_EXPORT void -MtxOrb_init_hbar (Driver *drvthis) +MtxOrb_init_old_hbar (Driver *drvthis) { } @@ -966,7 +969,7 @@ MtxOrb_get_info (Driver *drvthis) * This is the new version ussing dynamic icon alocation */ MODULE_EXPORT void -MtxOrb_vbar (Driver *drvthis, int x, int len) +MtxOrb_old_vbar (Driver *drvthis, int x, int len) { unsigned char mapu[9] = { barw, baru1, baru2, baru3, baru4, baru5, baru6, baru7, barb }; unsigned char mapd[9] = { barw, bard1, bard2, bard3, bard4, bard5, bard6, bard7, barb }; @@ -1009,7 +1012,7 @@ MtxOrb_vbar (Driver *drvthis, int x, int len) * This is the new version ussing dynamic icon alocation */ MODULE_EXPORT void -MtxOrb_hbar (Driver *drvthis, int x, int y, int len) +MtxOrb_old_hbar (Driver *drvthis, int x, int y, int len) { unsigned char mapr[6] = { barw, barr1, barr2, barr3, barr4, barb }; unsigned char mapl[6] = { barw, barl1, barl2, barl3, barl4, barb }; diff --git a/server/drivers/MtxOrb.h b/server/drivers/MtxOrb.h index 1e08ab7..d001a13 100644 --- a/server/drivers/MtxOrb.h +++ b/server/drivers/MtxOrb.h @@ -12,12 +12,7 @@ MODULE_EXPORT void MtxOrb_flush (Driver *drvthis); MODULE_EXPORT void MtxOrb_string (Driver *drvthis, int x, int y, char *string); MODULE_EXPORT void MtxOrb_chr (Driver *drvthis, int x, int y, char c); -MODULE_EXPORT void MtxOrb_vbar (Driver *drvthis, int x, int len); -MODULE_EXPORT void MtxOrb_hbar (Driver *drvthis, int x, int y, int len); -MODULE_EXPORT void MtxOrb_num (Driver *drvthis, int x, int num); -MODULE_EXPORT void MtxOrb_old_icon (Driver *drvthis, int which, char dest); MODULE_EXPORT void MtxOrb_heartbeat (Driver *drvthis, int type); - MODULE_EXPORT void MtxOrb_set_char (Driver *drvthis, int n, char *dat); MODULE_EXPORT int MtxOrb_get_contrast (Driver *drvthis); @@ -28,9 +23,19 @@ MODULE_EXPORT void MtxOrb_output (Driver *drvthis, int on); MODULE_EXPORT char MtxOrb_getkey (Driver *drvthis); MODULE_EXPORT char * MtxOrb_get_info (Driver *drvthis); -MODULE_EXPORT void MtxOrb_init_vbar (Driver *drvthis); -MODULE_EXPORT void MtxOrb_init_hbar (Driver *drvthis); MODULE_EXPORT void MtxOrb_init_num (Driver *drvthis); +MODULE_EXPORT void MtxOrb_num (Driver *drvthis, int x, int num); + +/* Old stuff to be removed */ +MODULE_EXPORT void MtxOrb_old_vbar (Driver *drvthis, int x, int len); +MODULE_EXPORT void MtxOrb_old_hbar (Driver *drvthis, int x, int y, int len); +MODULE_EXPORT void MtxOrb_old_icon (Driver *drvthis, int which, char dest); +MODULE_EXPORT void MtxOrb_init_old_vbar (Driver *drvthis); +MODULE_EXPORT void MtxOrb_init_old_hbar (Driver *drvthis); + +/* New version */ +MODULE_EXPORT void MtxOrb_icon (Driver *drvthis, int x, int y, int icon); + #define DEFAULT_CONTRAST 480 #define DEFAULT_DEVICE "/dev/lcd"