casting in fbdev

diff --git a/libwinnie/Makefile b/libwinnie/Makefile
index df1e0e9..b34283d 100644 (file)
--- a/libwinnie/Makefile
+++ b/libwinnie/Makefile
@@ -8,7 +8,7 @@ dbg = -g
 opt = -O0
 inc = -Isrc
 
-backend = SDL
+#backend = SDL
 
 ifeq ($(backend), SDL)
        def = -DWINNIE_SDL

diff --git a/libwinnie/src/fbdev/gfx.cc b/libwinnie/src/fbdev/gfx.cc
index f98b398..c5449ef 100644 (file)
--- a/libwinnie/src/fbdev/gfx.cc
+++ b/libwinnie/src/fbdev/gfx.cc
@@ -152,7 +152,7 @@ void destroy_gfx()
 
 bool client_open_gfx(void *smem_start, int offset)
 {
-       gfx = (unsigned char*)smem_start + offset;
+       gfx = (Graphics*)((unsigned char*)smem_start + offset);
        return true;
 }
 

diff --git a/libwinnie/src/fbdev/keyboard.cc b/libwinnie/src/fbdev/keyboard.cc
index 7ac1263..45f26e6 100644 (file)
--- a/libwinnie/src/fbdev/keyboard.cc
+++ b/libwinnie/src/fbdev/keyboard.cc
@@ -110,7 +110,7 @@ void destroy_keyboard()
 
 bool client_open_keyboard(void *smem_start, int offset)
 {
-       keyboard = (unsigned char*)smem_start + offset;
+       keyboard = (Keyboard*)((unsigned char*)smem_start + offset);
        return true;
 }
 

diff --git a/libwinnie/src/fbdev/mouse.cc b/libwinnie/src/fbdev/mouse.cc
index 8563da8..5805879 100644 (file)
--- a/libwinnie/src/fbdev/mouse.cc
+++ b/libwinnie/src/fbdev/mouse.cc
@@ -85,7 +85,7 @@ void destroy_mouse()
 
 bool client_open_mouse(void *smem_start, int offset)
 {
-       mouse = (unsigned char*)smem_start + offset;
+       mouse = (Mouse*)((unsigned char*)smem_start + offset);
        return true;
 }
 

diff --git a/libwinnie/src/shalloc.cc b/libwinnie/src/shalloc.cc
index 6595406..1bb7db2 100644 (file)
--- a/libwinnie/src/shalloc.cc
+++ b/libwinnie/src/shalloc.cc
@@ -77,8 +77,6 @@ bool init_shared_memory()
                fprintf(stderr, "Failed to map shared memory: %s\n", strerror(errno));
        }
 
-       shm_unlink(SHMNAME);
-
        for(int i=0; i<BITMAP_SIZE; i++) {
                bitmap[i] = 0;
        }
@@ -95,6 +93,7 @@ void destroy_shared_memory()
        if(munmap(pool, POOL_SIZE) == -1) {
                fprintf(stderr, "Failed to unmap shared memory: %s\n", strerror(errno));
        }
+       shm_unlink(SHMNAME);
 }
 
 void *sh_malloc(size_t bytes)

diff --git a/libwinnie/src/winnie.cc b/libwinnie/src/winnie.cc
index 121c7d6..f9ebc92 100644 (file)
--- a/libwinnie/src/winnie.cc
+++ b/libwinnie/src/winnie.cc
@@ -96,7 +96,6 @@ bool winnie_open()
                fprintf(stderr, "Failed to map shared memory: %s\n", strerror(errno));
                return false;
        }
-       shm_unlink(SHMNAME);
 
        subsys = (Subsys*)pool;
 

diff --git a/winnie/Makefile b/winnie/Makefile
index 6065e37..ee09869 100644 (file)
--- a/winnie/Makefile
+++ b/winnie/Makefile
@@ -20,7 +20,7 @@ CXX = g++
 CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc) $(def) `freetype-config --cflags`
 LDFLAGS = -L../libwinnie $(libs) `freetype-config --libs` -lrt -lwinnie
 
-$(bin): $(obj)
+$(bin): $(obj) ../libwinnie/libwinnie.so
        $(CXX) -o $@ $(obj) $(LDFLAGS) -Wl,-rpath=../libwinnie
 
 -include $(dep)