Rename _?bar and init_?bar stuff to _old_.

This commit is contained in:
dglaude
2002-01-17 20:51:31 +00:00
parent 5b9200acf7
commit ca162dc94d
2 changed files with 24 additions and 16 deletions
+12 -9
View File
@@ -438,13 +438,17 @@ MtxOrb_init (Driver *drvthis, char *args)
drvthis->clear = MtxOrb_clear; drvthis->clear = MtxOrb_clear;
drvthis->string = MtxOrb_string; drvthis->string = MtxOrb_string;
drvthis->chr = MtxOrb_chr; 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->num = MtxOrb_num;
drvthis->init_num = MtxOrb_init_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->init = MtxOrb_init;
drvthis->close = MtxOrb_close; drvthis->close = MtxOrb_close;
drvthis->width = MtxOrb_width; drvthis->width = MtxOrb_width;
@@ -455,7 +459,6 @@ MtxOrb_init (Driver *drvthis, char *args)
drvthis->backlight = MtxOrb_backlight; drvthis->backlight = MtxOrb_backlight;
drvthis->output = MtxOrb_output; drvthis->output = MtxOrb_output;
drvthis->set_char = MtxOrb_set_char; drvthis->set_char = MtxOrb_set_char;
drvthis->old_icon = MtxOrb_old_icon;
drvthis->icon = MtxOrb_icon; drvthis->icon = MtxOrb_icon;
@@ -822,7 +825,7 @@ MtxOrb_cursorblink (Driver *drvthis, int on)
* Sets up for vertical bars. Call before lcd.vbar() * Sets up for vertical bars. Call before lcd.vbar()
*/ */
MODULE_EXPORT void 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... * Inits horizontal bars...
*/ */
MODULE_EXPORT void 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 * This is the new version ussing dynamic icon alocation
*/ */
MODULE_EXPORT void 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 mapu[9] = { barw, baru1, baru2, baru3, baru4, baru5, baru6, baru7, barb };
unsigned char mapd[9] = { barw, bard1, bard2, bard3, bard4, bard5, bard6, bard7, 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 * This is the new version ussing dynamic icon alocation
*/ */
MODULE_EXPORT void 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 mapr[6] = { barw, barr1, barr2, barr3, barr4, barb };
unsigned char mapl[6] = { barw, barl1, barl2, barl3, barl4, barb }; unsigned char mapl[6] = { barw, barl1, barl2, barl3, barl4, barb };
+12 -7
View File
@@ -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_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_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_heartbeat (Driver *drvthis, int type);
MODULE_EXPORT void MtxOrb_set_char (Driver *drvthis, int n, char *dat); MODULE_EXPORT void MtxOrb_set_char (Driver *drvthis, int n, char *dat);
MODULE_EXPORT int MtxOrb_get_contrast (Driver *drvthis); 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_getkey (Driver *drvthis);
MODULE_EXPORT char * MtxOrb_get_info (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_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_CONTRAST 480
#define DEFAULT_DEVICE "/dev/lcd" #define DEFAULT_DEVICE "/dev/lcd"