mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary init_[hv]bar() methods

Browse Source
This commit is contained in:
marschap
2006-04-25 18:29:10 +00:00
parent ce37984afc
commit 2d7bc08f12
2 changed files with 74 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/CFontzPacket.c
+42 -66
View File
@@ -189,8 +189,6 @@ MODULE_EXPORT char *symbol_prefix = "CFontzPacket_";
/* static void CFontzPacket_autoscroll (int on); */
static void CFontzPacket_hidecursor (Driver *drvthis);
static void CFontzPacket_reboot (Driver *drvthis);
static void CFontzPacket_init_vbar (Driver *drvthis);
static void CFontzPacket_init_hbar (Driver *drvthis);
static void CFontzPacket_no_live_report (Driver *drvthis);
static void CFontzPacket_hardware_clear (Driver *drvthis);
@@ -866,68 +864,6 @@ CFontzPacket_reboot (Driver *drvthis)
}
/*
* Sets up for vertical bars.
*/
static void
CFontzPacket_init_vbar (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
if (p->ccmode != vbar) {
unsigned char vBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: init_vbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
p->ccmode = vbar;
memset(vBar, 0x00, sizeof(vBar));
for (i = 1; i < p->cellheight; i++) {
// add pixel line per pixel line ...
vBar[p->cellheight - i] = 0xFF;
CFontzPacket_set_char(drvthis, i, vBar);
}
}
}
/*
* Inits horizontal bars...
*/
static void
CFontzPacket_init_hbar (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
if (p->ccmode != hbar) {
unsigned char hBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: init_hbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
p->ccmode = hbar;
memset(hBar, 0x00, sizeof(hBar));
for (i = 1; i <= p->cellwidth; i++) {
// fill pixel columns from left to right.
memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar)-1);
CFontzPacket_set_char(drvthis, i, hBar);
}
}
}
/*
* Draws a vertical bar...
*/
@@ -942,7 +878,27 @@ CFontzPacket_vbar (Driver *drvthis, int x, int y, int len, int promille, int opt
*/
PrivateData *p = drvthis->private_data;
CFontzPacket_init_vbar(drvthis);
if (p->ccmode != vbar) {
unsigned char vBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: vbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
p->ccmode = vbar;
memset(vBar, 0x00, sizeof(vBar));
for (i = 1; i < p->cellheight; i++) {
// add pixel line per pixel line ...
vBar[p->cellheight - i] = 0xFF;
CFontzPacket_set_char(drvthis, i, vBar);
}
}
lib_vbar_static(drvthis, x, y, len, promille, options, p->cellheight, 0);
}
@@ -961,7 +917,27 @@ CFontzPacket_hbar (Driver *drvthis, int x, int y, int len, int promille, int opt
*/
PrivateData *p = drvthis->private_data;
CFontzPacket_init_hbar(drvthis);
if (p->ccmode != hbar) {
unsigned char hBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: hbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
p->ccmode = hbar;
memset(hBar, 0x00, sizeof(hBar));
for (i = 1; i <= p->cellwidth; i++) {
// fill pixel columns from left to right.
memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar)-1);
CFontzPacket_set_char(drvthis, i, hBar);
}
}
lib_hbar_static(drvthis, x, y, len, promille, options, p->cellwidth, 0);
}
server/drivers/IOWarrior.c
+32 -57
View File
@@ -668,22 +668,28 @@ PrivateData *p = drvthis->private_data;
}
/*********************************************************
* NOTAPI: Inits vertical bars...
* This was part of API in 0.4 and removed in 0.5
/*************************************************************
* API: Draws a vertical bar...
*/
static void
IOWarrior_init_vbar(Driver *drvthis)
MODULE_EXPORT void
IOWarrior_vbar(Driver *drvthis, int x, int y, int len, int promille, int options)
{
PrivateData *p = drvthis->private_data;
/* x and y are the start position of the bar.
* The bar by default grows in the 'up' direction
*(other direction not yet implemented).
* len is the number of characters that the bar is long at 100%
* promille is the number of promilles(0..1000) that the bar should be filled.
*/
if (p->ccmode != vbar) {
unsigned char vBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: init_vbar: cannot combine two modes using user defined characters",
report(RPT_WARNING, "%s: vbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
@@ -697,55 +703,6 @@ PrivateData *p = drvthis->private_data;
IOWarrior_set_char(drvthis, i, vBar);
}
}
}
/*********************************************************
* NOTAPI: Inits horizontal bars...
* This was part of API in 0.4 and removed in 0.5
*/
static void
IOWarrior_init_hbar(Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
if (p->ccmode != hbar) {
unsigned char hBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: init_hbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
p->ccmode = hbar;
for (i = 1; i <= p->cellwidth; i++) {
// fill pixel columns from left to right.
memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar));
IOWarrior_set_char(drvthis, i, hBar);
}
}
}
/*************************************************************
* API: Draws a vertical bar...
*/
MODULE_EXPORT void
IOWarrior_vbar(Driver *drvthis, int x, int y, int len, int promille, int options)
{
PrivateData *p = drvthis->private_data;
IOWarrior_init_vbar(drvthis);
/* x and y are the start position of the bar.
* The bar by default grows in the 'up' direction
*(other direction not yet implemented).
* len is the number of characters that the bar is long at 100%
* promille is the number of promilles(0..1000) that the bar should be filled.
*/
lib_vbar_static(drvthis, x, y, len, promille, options, p->cellheight, 0);
}
@@ -759,8 +716,6 @@ IOWarrior_hbar(Driver *drvthis, int x, int y, int len, int promille, int options
{
PrivateData *p = drvthis->private_data;
IOWarrior_init_hbar(drvthis);
/* x and y are the start position of the bar.
* The bar by default grows in the 'cwrightup' direction
*(other direction not yet implemented).
@@ -768,6 +723,26 @@ PrivateData *p = drvthis->private_data;
* promille is the number of promilles(0..1000) that the bar should be filled.
*/
if (p->ccmode != hbar) {
unsigned char hBar[p->cellheight];
int i;
if (p->ccmode != standard) {
/* Not supported(yet) */
report(RPT_WARNING, "%s: hbar: cannot combine two modes using user defined characters",
drvthis->name);
return;
}
p->ccmode = hbar;
for (i = 1; i <= p->cellwidth; i++) {
// fill pixel columns from left to right.
memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar));
IOWarrior_set_char(drvthis, i, hBar);
}
}
lib_hbar_static(drvthis, x, y, len, promille, options, p->cellwidth, 0);
}