summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Ritter <unrzl1@linux.rrze.uni-erlangen.de>2008-12-15 16:17:09 +0100
committerMarcel Ritter <unrzl1@linux.rrze.uni-erlangen.de>2008-12-15 16:17:09 +0100
commit68c0e55e8f6f9dc22f5c8c1a8930b616a101b13a (patch)
tree3847780d1827e5d9309fc410be7f615874d456d5
parentc70f91446e978a8ea113b00de33d8d862d5d0d58 (diff)
downloadsyslinux-68c0e55e8f6f9dc22f5c8c1a8930b616a101b13a.tar.gz
syslinux-68c0e55e8f6f9dc22f5c8c1a8930b616a101b13a.tar.xz
syslinux-68c0e55e8f6f9dc22f5c8c1a8930b616a101b13a.zip
COM32: lua - add vesa functions (only mode listing right now)
-rw-r--r--com32/lua/src/Makefile1
-rw-r--r--com32/lua/src/linit.c1
-rw-r--r--com32/lua/src/lualib.h4
-rw-r--r--com32/lua/src/vesa.c127
-rw-r--r--com32/lua/test/vesa.lua11
5 files changed, 144 insertions, 0 deletions
diff --git a/com32/lua/src/Makefile b/com32/lua/src/Makefile
index 366bfc20..967c1577 100644
--- a/com32/lua/src/Makefile
+++ b/com32/lua/src/Makefile
@@ -54,6 +54,7 @@ LIBLUA_OBJS += lauxlib.o lbaselib.o ldblib.o ltablib.o \
LIBLUA_OBJS += liolib.o
LIBLUA_OBJS += dmi.o ../../modules/dmi.o
LIBLUA_OBJS += pci.o
+LIBLUA_OBJS += vesa.o
CFLAGS += -DLUA_ANSI
diff --git a/com32/lua/src/linit.c b/com32/lua/src/linit.c
index bd908e40..3f15fd05 100644
--- a/com32/lua/src/linit.c
+++ b/com32/lua/src/linit.c
@@ -28,6 +28,7 @@ static const luaL_Reg lualibs[] = {
{LUA_DBLIBNAME, luaopen_debug},
{LUA_DMILIBNAME, luaopen_dmi},
{LUA_SYSLINUXLIBNAME, luaopen_syslinux},
+ {LUA_VESALIBNAME, luaopen_vesa},
{NULL, NULL}
};
diff --git a/com32/lua/src/lualib.h b/com32/lua/src/lualib.h
index 3f53b105..e169a0f9 100644
--- a/com32/lua/src/lualib.h
+++ b/com32/lua/src/lualib.h
@@ -48,6 +48,10 @@ LUALIB_API int (luaopen_syslinux) (lua_State *L);
#define LUA_DMILIBNAME "dmi"
LUALIB_API int (luaopen_dmi) (lua_State *L);
+#define LUA_VESALIBNAME "vesa"
+LUALIB_API int (luaopen_vesa) (lua_State *L);
+
+
/* open all previous libraries */
LUALIB_API void (luaL_openlibs) (lua_State *L);
diff --git a/com32/lua/src/vesa.c b/com32/lua/src/vesa.c
new file mode 100644
index 00000000..d58dfaa3
--- /dev/null
+++ b/com32/lua/src/vesa.c
@@ -0,0 +1,127 @@
+#include <stdlib.h>
+#include <string.h>
+
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
+#include "../../lib/sys/vesa/vesa.h"
+#include "../../lib/sys/vesa/video.h"
+
+
+static int __constfunc is_power_of_2(unsigned int x)
+{
+ return x && !(x & (x-1));
+}
+
+static int vesacon_paged_mode_ok(const struct vesa_mode_info *mi)
+{
+ int i;
+
+ if (!is_power_of_2(mi->win_size) ||
+ !is_power_of_2(mi->win_grain) ||
+ mi->win_grain > mi->win_size)
+ return 0; /* Impossible... */
+
+ for (i = 0; i < 2; i++) {
+ if ((mi->win_attr[i] & 0x05) == 0x05 && mi->win_seg[i])
+ return 1; /* Usable window */
+ }
+
+ return 0; /* Nope... */
+}
+
+static int vesa_getmodes(lua_State *L)
+{
+ com32sys_t rm;
+ uint16_t mode, bestmode, *mode_ptr;
+ struct vesa_general_info *gi;
+ struct vesa_mode_info *mi;
+ enum vesa_pixel_format bestpxf;
+ int nmode = 1;
+
+ /* Allocate space in the bounce buffer for these structures */
+ gi = &((struct vesa_info *)__com32.cs_bounce)->gi;
+ mi = &((struct vesa_info *)__com32.cs_bounce)->mi;
+
+ memset(&rm, 0, sizeof rm);
+ memset(gi, 0, sizeof *gi);
+
+ gi->signature = VBE2_MAGIC; /* Get VBE2 extended data */
+ rm.eax.w[0] = 0x4F00; /* Get SVGA general information */
+ rm.edi.w[0] = OFFS(gi);
+ rm.es = SEG(gi);
+ __intcall(0x10, &rm, &rm);
+
+ if ( rm.eax.w[0] != 0x004F )
+ return -1; /* Function call failed */
+ if ( gi->signature != VESA_MAGIC )
+ return -2; /* No magic */
+ if ( gi->version < 0x0102 )
+ return -3; /* VESA 1.2+ required */
+
+ lua_newtable(L); /* list of modes */
+
+ /* Copy general info */
+ memcpy(&__vesa_info.gi, gi, sizeof *gi);
+
+ /* Search for a 640x480 mode with a suitable color and memory model... */
+
+ mode_ptr = GET_PTR(gi->video_mode_ptr);
+ bestmode = 0;
+ bestpxf = PXF_NONE;
+
+ while ((mode = *mode_ptr++) != 0xFFFF) {
+ mode &= 0x1FF; /* The rest are attributes of sorts */
+
+ printf("Found mode: 0x%04x (%dx%dx%d)\n", mode, mi->h_res, mi->v_res, mi->bpp);
+
+ memset(mi, 0, sizeof *mi);
+ rm.eax.w[0] = 0x4F01; /* Get SVGA mode information */
+ rm.ecx.w[0] = mode;
+ rm.edi.w[0] = OFFS(mi);
+ rm.es = SEG(mi);
+ __intcall(0x10, &rm, &rm);
+
+ /* Must be a supported mode */
+ if ( rm.eax.w[0] != 0x004f )
+ continue;
+
+ lua_pushnumber(L, nmode++);
+ lua_newtable(L); /* mode info */
+
+ lua_pushstring(L, "mode");
+ lua_pushnumber(L, mode);
+ lua_settable(L,-3);
+
+ lua_pushstring(L, "hres");
+ lua_pushnumber(L, mi->h_res);
+ lua_settable(L,-3);
+
+ lua_pushstring(L, "vres");
+ lua_pushnumber(L, mi->v_res);
+ lua_settable(L,-3);
+
+ lua_pushstring(L, "bpp");
+ lua_pushnumber(L, mi->bpp);
+ lua_settable(L,-3);
+
+ lua_settable(L, -3); /* add to mode list */
+
+ }
+
+ return 1;
+}
+
+
+static const luaL_reg vesalib[] = {
+ {"getmodes", vesa_getmodes},
+ {NULL, NULL}
+};
+
+/* This defines a function that opens up your library. */
+
+LUALIB_API int luaopen_vesa (lua_State *L) {
+ luaL_openlib(L, LUA_VESALIBNAME, vesalib, 0);
+ return 1;
+}
+
diff --git a/com32/lua/test/vesa.lua b/com32/lua/test/vesa.lua
new file mode 100644
index 00000000..4bc41fbc
--- /dev/null
+++ b/com32/lua/test/vesa.lua
@@ -0,0 +1,11 @@
+-- get nice output
+printf = function(s,...)
+ return io.write(s:format(...))
+ end
+
+modes = vesa.getmodes()
+
+for mind,mode in pairs(modes) do
+ printf("%04x: %dx%dx%d\n", mode['mode'], mode['hres'], mode['vres'], mode['bpp'])
+end
+