Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_fb
Modified Files:
ecore_fb_li.c
Log Message:
big endian fix from the big easy! :)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/ecore_fb_li.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_fb_li.c 9 Aug 2006 08:24:45 -0000 1.3
+++ ecore_fb_li.c 7 May 2008 14:02:21 -0000 1.4
@@ -1,15 +1,6 @@
#include "Ecore_Fb.h"
#include "ecore_fb_private.h"
-
-/* Copyright (C) Brad Hards (1999-2002).
- * this macro is used to tell if "bit" is set in "array"
- * it selects a byte from the array, and does a boolean AND
- * operation with a byte that only has the relevant bit set.
- * eg. to check for the 12th bit, we do (array[1] & 1<<4)
- */
-#define TEST_BIT(bit, array) (array[bit/8] & (1<<(bit%8)))
-
#define CLICK_THRESHOLD_DEFAULT 0.25
static Ecore_List *_ecore_fb_li_devices = NULL;
@@ -19,6 +10,28 @@
#include "ecore_fb_keytable.h"
};
+/* Initial Copyright (C) Brad Hards (1999-2002),
+ * this function is used to tell if "bit" is set in "array"
+ * it selects a byte from the array, and does a boolean AND
+ * operation with a byte that only has the relevant bit set.
+ * eg. to check for the 12th bit, we do (array[1] & 1<<4).
+ * Moved to static inline in order to force compiler to otimized
+ * the unsued part away or force a link error if long has an unexpected
+ * size.
+ * - bigeasy
+ */
+extern int long_has_neither_32_not_64_bits(void);
+static inline int test_bit(int bit, unsigned long *array)
+{
+ if (sizeof(long) == 4)
+ return array[bit / 32] & (1 << (bit % 32));
+
+ else if (sizeof(long) == 8)
+ return array[bit / 64] & (1 << (bit % 64));
+
+ else long_has_neither_32_nor_64_bits();
+}
+
static void
_ecore_fb_li_event_free_key_down(void *data, void *ev)
{
@@ -334,6 +347,10 @@
dev->listen = listen;
}
+#ifndef EV_CNT
+#define EV_CNT (EV_MAX+1)
+#endif
+
/*
* Opens an input device
*/
@@ -341,7 +358,7 @@
ecore_fb_input_device_open(const char *dev)
{
Ecore_Fb_Input_Device *device;
- char event_type_bitmask[EV_MAX/8 + 1];
+ unsigned long event_type_bitmask[EV_CNT / 32 + 1];
int event_type;
int fd;
@@ -378,7 +395,7 @@
/* set info */
for(event_type = 0; event_type < EV_MAX; event_type++)
{
- if(!TEST_BIT(event_type, event_type_bitmask))
+ if(!test_bit(event_type, event_type_bitmask))
continue;
switch(event_type)
{
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
