From f3f5fed8103fadc23d2cc8eda0438bd665af4629 Mon Sep 17 00:00:00 2001 From: Ali Gholami Rudi Date: Wed, 6 Apr 2011 09:10:30 +0430 Subject: [PATCH] update draw.c from the latest fbpad --- draw.c | 22 ---------------------- draw.h | 5 +++-- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/draw.c b/draw.c index 5e8d622..88caff2 100644 --- a/draw.c +++ b/draw.c @@ -9,8 +9,6 @@ #include "draw.h" #include "util.h" -#define FBDEV_PATH "/dev/fb0" -#define MAXFBWIDTH (1 << 12) #define BPP sizeof(fbval_t) #define NLEVELS (1 << 8) @@ -133,23 +131,3 @@ int fb_cols(void) { return vinfo.xres; } - -static unsigned char *rowaddr(int r) -{ - return fb + (r + vinfo.yoffset) * finfo.line_length; -} - -static unsigned long cache[MAXFBWIDTH]; -void fb_box(int sr, int sc, int er, int ec, fbval_t val) -{ - int i; - int pc = sizeof(cache[0]) / sizeof(val); - int cn = MIN((ec - sc) / pc + 1, MAXFBWIDTH); - unsigned long nv = val; - for (i = 1; i < pc; i++) - nv = (nv << (sizeof(val) * 8)) | val; - for (i = 0; i < cn; i++) - cache[i] = nv; - for (i = sr; i < er; i++) - memcpy(rowaddr(i) + sc * BPP, cache, (ec - sc) * BPP); -} diff --git a/draw.h b/draw.h index 0ed1fbe..d9c9571 100644 --- a/draw.h +++ b/draw.h @@ -1,9 +1,10 @@ -typedef unsigned short fbval_t; +#define FBDEV_PATH "/dev/fb0" +typedef unsigned int fbval_t; + void fb_init(void); void fb_free(void); fbval_t fb_color(unsigned char r, unsigned char g, unsigned char b); void fb_set(int r, int c, fbval_t *mem, int len); int fb_rows(void); int fb_cols(void); -void fb_box(int sr, int sc, int er, int ec, fbval_t val); void fb_cmap(void); -- 2.11.4.GIT