renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #198 from tchaikov/remove-dependency

Browse Source 
remove dependency on <linux/fb.h>
This commit is contained in:
HW
2012-06-10 03:00:56 -07:00
parent 794e9188fc 0e561c610a
commit 4fb745a0df
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
einkfb.c
View File

@@ -83,6 +83,8 @@ static int openFrameBuffer(lua_State *L) {
if(fb->buf->data == MAP_FAILED) {
return luaL_error(L, "cannot mmap framebuffer");
}
memset(fb->buf->data, 0, fb->finfo.smem_len);
fb->buf->pitch = fb->finfo.line_length;
#else
if(SDL_Init(SDL_INIT_VIDEO) < 0) {
return luaL_error(L, "cannot initialize SDL.");
@@ -91,26 +93,17 @@ static int openFrameBuffer(lua_State *L) {
return luaL_error(L, "can't get video surface %dx%d for 32bpp.",
EMULATE_READER_W, EMULATE_READER_H);
}
memset(&fb->finfo, 0, sizeof(fb->finfo));
memset(&fb->vinfo, 0, sizeof(fb->vinfo));
fb->vinfo.xres = EMULATE_READER_W;
fb->vinfo.yres = EMULATE_READER_H;
fb->vinfo.grayscale = 1;
fb->vinfo.bits_per_pixel = 4;
fb->finfo.smem_len = ((EMULATE_READER_W + 1) / 2) * EMULATE_READER_H;
fb->finfo.line_length = (EMULATE_READER_W + 1) / 2;
fb->finfo.type = FB_TYPE_PACKED_PIXELS;
fb->buf->data = malloc(fb->finfo.smem_len);
fb->buf->pitch = (EMULATE_READER_W + 1) / 2;
fb->buf->data = calloc(fb->buf->pitch * EMULATE_READER_H, sizeof(char));
if(fb->buf->data == NULL) {
return luaL_error(L, "cannot get framebuffer emu memory");
}
#endif
memset(fb->buf->data, 0, fb->finfo.smem_len);
fb->buf->w = fb->vinfo.xres;
fb->buf->h = fb->vinfo.yres;
fb->buf->pitch = fb->finfo.line_length;
fb->buf->allocated = 0;
return 1;
}

11
einkfb.h
View File

@@ -18,10 +18,14 @@
#ifndef _PDF_EINKFB_H
#define _PDF_EINKFB_H
#include <linux/fb.h>
#ifdef EMULATE_READER
#include <SDL.h>
struct fb_var_screeninfo {
uint32_t xres;
uint32_t yres;
};
#else
#include <linux/fb.h>
#include "include/einkfb.h"
#endif
@@ -34,11 +38,12 @@
typedef struct FBInfo {
int fd;
BlitBuffer *buf;
struct fb_fix_screeninfo finfo;
struct fb_var_screeninfo vinfo;
#ifdef EMULATE_READER
SDL_Surface *screen;
#else
struct fb_fix_screeninfo finfo;
#endif
struct fb_var_screeninfo vinfo;
} FBInfo;
int luaopen_einkfb(lua_State *L);