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

Solve the segmentation fault in MtxOrb.c

Browse Source 
If framebuf is not alocated when init is called then we do.
A lot of warning are removed because MtxOrb.h is cleaned.
For the futur, double buffering is already prepared.
I also have done some cleaning of unused function related to hbar/vbar.
BigNum are still not working nicely but I am working on it.
I don't have flickering on my screen so I cannot fix that problem!
This commit is contained in:
dglaude
2001-11-19 18:35:39 +00:00
parent 092b89dcdf
commit ca27bcac18
2 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/MtxOrb.c
+52 -18
View File
@@ -43,9 +43,8 @@
// NOTE: This does not appear to make use of the
// hbar and vbar functions present in the LKD202-25.
// Why I do not know.
// RESP: Because software emulated hbar/vbar permit simultaneous use.
static int custom = 0;
static enum {MTXORB_LCD, MTXORB_LKD, MTXORB_VFD, MTXORB_VKD} MtxOrb_type;
extern int debug_level;
// TODO: Remove this custom_type if not in use anymore.
@@ -84,6 +83,10 @@ typedef enum {
barb = 255
} bar_type;
// The following variable should be per instance of the driver.
static char * lcd_contents = (char *) 0; // for incremental updates
static int custom = 0;
static enum {MTXORB_LCD, MTXORB_LKD, MTXORB_VFD, MTXORB_VKD} MtxOrb_type;
static int fd;
static int clear = 1;
@@ -95,6 +98,36 @@ static void MtxOrb_autoscroll (int on);
static void MtxOrb_cursorblink (int on);
static void MtxOrb_string (int x, int y, char *string);
/*
* This does not belong to MtxOrb.h except if used externaly
* Having them here reduce the number of warning.
*/
static void MtxOrb_clear ();
static void MtxOrb_close ();
static void MtxOrb_flush ();
static void MtxOrb_flush_box (int lft, int top, int rgt, int bot);
static void MtxOrb_chr (int x, int y, char c);
static int MtxOrb_contrast (int contrast);
static void MtxOrb_backlight (int on);
static void MtxOrb_output (int on);
static void MtxOrb_init_vbar ();
static void MtxOrb_init_hbar ();
static void MtxOrb_vbar (int x, int len);
static void MtxOrb_hbar (int x, int y, int len);
static void MtxOrb_init_num ();
static void MtxOrb_num (int x, int num);
static void MtxOrb_set_char (int n, char *dat);
static void MtxOrb_icon (int which, char dest);
static void MtxOrb_draw_frame (char *dat);
static char MtxOrb_getkey ();
static char * MtxOrb_getinfo ();
static void MtxOrb_heartbeat (int type);
static int MtxOrb_ask_bar (int type);
static void MtxOrb_set_known_char (int car, int type);
/*
* End of what was in MtxOrb.h
*/
static int
MtxOrb_set_type (char * str) {
char c;
@@ -348,6 +381,18 @@ MtxOrb_init (lcd_logical_driver * driver, char *args)
// Do it...
tcsetattr (fd, TCSANOW, &portset);
// Make sure the frame buffer is there...
if (!MtxOrb->framebuf)
MtxOrb->framebuf = (unsigned char *)
malloc (MtxOrb->wid * MtxOrb->hgt);
memset (MtxOrb->framebuf, ' ', MtxOrb->wid * MtxOrb->hgt);
// Allocate and clear the buffer for incremental updates
lcd_contents = (unsigned char *) malloc (MtxOrb->wid * MtxOrb->hgt);
if (!lcd_contents) { return -1; }
memset(lcd_contents, ' ', MtxOrb->wid * MtxOrb->hgt);
/*
* Configure display
*/
@@ -424,6 +469,11 @@ MtxOrb_close ()
MtxOrb->framebuf = NULL;
if (lcd_contents)
free (lcd_contents);
lcd_contents = NULL;
if (debug_level > 3)
syslog(LOG_DEBUG, "MtxOrb: closed");
}
@@ -686,26 +736,20 @@ MtxOrb_cursorblink (int on)
}
}
//// TODO: Might not be needed anymore...
/////////////////////////////////////////////////////////////////
// Sets up for vertical bars. Call before lcd.vbar()
//
static void
MtxOrb_init_vbar ()
{
// Isn't this function supposed to go away?
MtxOrb_init_all (vbar);
}
// TODO: Might not be needed anymore...
/////////////////////////////////////////////////////////////////
// Inits horizontal bars...
//
static void
MtxOrb_init_hbar ()
{
// Isn't this function supposed to go away?
MtxOrb_init_all (hbar);
}
/////////////////////////////////////////////////////////////////
@@ -1534,13 +1578,3 @@ MtxOrb_set_known_char (int car, int type)
MtxOrb_set_char (car, &all_bar[type][0]);
}
/////////////////STOP READING --- TRASH IS AT THE END////////////////
// TODO: Remove this code wich was use for developpement.
// PS: There might be reference to this code left, so keep it for some time.
//
// MtxOrb_init_hbar and MtxOrb_init_vbar use it; it's prototyped in MtxOrb.h ...
static void
MtxOrb_init_all (int type)
{
}
server/drivers/MtxOrb.h
+3 -3
View File
@@ -4,6 +4,8 @@
extern lcd_logical_driver *MtxOrb;
int MtxOrb_init (lcd_logical_driver * driver, char *device);
/*
* Just like in hd44780 those function are assing by _init ...
static void MtxOrb_clear ();
static void MtxOrb_close ();
static void MtxOrb_flush ();
@@ -27,9 +29,7 @@ static void MtxOrb_heartbeat (int type);
static int MtxOrb_ask_bar (int type);
static void MtxOrb_set_known_char (int car, int type);
// Isn't this function supposed to go away?
static void MtxOrb_init_all (int type);
*/
#define DEFAULT_CONTRAST 120
#define DEFAULT_DEVICE "/dev/lcd"