[gentoo-commits] gentoo-src commit in xac/src: bioscall.c setup.py vbe.c

[Joseph Jezak (josejx)]

josejx      08/01/06 19:47:19

  Modified:             bioscall.c setup.py vbe.c
  Log:
  Fixed vbe on amd64 with dummy module, another range fix.

Revision  Changes    Path
1.2                  xac/src/bioscall.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/bioscall.c?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/bioscall.c?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/bioscall.c?r1=1.1&r2=1.2

Index: bioscall.c
===================================================================
RCS file: /var/cvsroot/gentoo-src/xac/src/bioscall.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bioscall.c	25 Aug 2006 19:48:26 -0000	1.1
+++ bioscall.c	6 Jan 2008 19:47:18 -0000	1.2
@@ -6,6 +6,9 @@
  * Joseph Jezak, 2006
  */
 
+#if defined(__i386__) && (defined(__linux__) || defined(__NetBSD__) \
+	|| defined(__FreeBSD__) || defined(__OpenBSD__))
+
 #include <sys/types.h>
 #include <sys/io.h>
 #include <sys/stat.h>
@@ -355,3 +358,5 @@
 	do_vm86(&vm, mem, BIOSCALL_START_OFS + sizeof(call));
 	memcpy(regs, &vm.regs, sizeof(vm.regs));
 }
+
+#endif /* (__linux__ || __NetBSD__ || __FreeBSD__ || __OpenBSD__) && __i386__ */



1.3                  xac/src/setup.py

file : http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/setup.py?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/setup.py?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/setup.py?r1=1.2&r2=1.3

Index: setup.py
===================================================================
RCS file: /var/cvsroot/gentoo-src/xac/src/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.py	13 Feb 2007 00:52:31 -0000	1.2
+++ setup.py	6 Jan 2008 19:47:18 -0000	1.3
@@ -8,11 +8,7 @@
 vbe_module = Extension("vbe",
 			sources = ["bioscall.c", "lrmi.c", "vbe.c"])
 
-### If we're not building for x86, don't build the vbe module
-if 1:
-	ext_modules = [pci_module]
-else:
-	ext_modules = [pci_module, vbe_module]
+ext_modules = [pci_module, vbe_module]
 
 setup(	name="pci",
 	version="1.0",



1.4                  xac/src/vbe.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/vbe.c?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/vbe.c?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/xac/src/vbe.c?r1=1.3&r2=1.4

Index: vbe.c
===================================================================
RCS file: /var/cvsroot/gentoo-src/xac/src/vbe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vbe.c	1 Mar 2007 21:10:59 -0000	1.3
+++ vbe.c	6 Jan 2008 19:47:18 -0000	1.4
@@ -10,6 +10,9 @@
  *
  */
 
+#if defined(__i386__) && (defined(__linux__) || defined(__NetBSD__) \
+	|| defined(__FreeBSD__) || defined(__OpenBSD__))
+
 #include <sys/types.h>
 #include <sys/io.h>
 #include <sys/mman.h>
@@ -31,9 +34,8 @@
 	int ret = 0;
 
 	/* Initialize LRMI. */
-	if(LRMI_init() == 0) {
-		return 0;
-	}
+	if(LRMI_init() == 0) 
+		return Py_BuildValue("i", 0);
 
 	memset(&regs, 0, sizeof(regs));
 	regs.eax = 0x4f15;
@@ -46,19 +48,17 @@
 	ioperm(0, 0x400, 1);
 
 	if(LRMI_int(0x10, &regs) == 0) {
-		return 0;
+		ret = 0;
 	}
-
-	/* Check for successful return. */
-	if((regs.eax & 0xff) == 0x4f) {
+	else {
 		/* Supported. */
-		ret = 1;
-	} else {
+		if((regs.eax & 0xff) == 0x4f) 
+			ret = 1;
 		/* Not supported. */
-		ret = 0;
+		else 
+			ret = 0;
 	}
 
-	/* Clean up and return. */
 	return Py_BuildValue("i", ret);
 }
 
@@ -72,15 +72,14 @@
 	PyObject *p;
 
 	/* Initialize LRMI. */
-	if(LRMI_init() == 0) {
+	if(LRMI_init() == 0) 
 		return NULL;
-	}
 
 	/* Allocate a chunk of memory. */
 	mem = LRMI_alloc_real(sizeof(struct vbe_edid1_info));
-	if(mem == NULL) {
+	if(mem == NULL) 
 		return NULL;
-	}
+
 	memset(mem, 0, sizeof(struct vbe_edid1_info));
 
 	memset(&regs, 0, sizeof(regs));
@@ -144,3 +143,23 @@
 	PyObject *m;
 	m = Py_InitModule3("vbe", module_methods,"Allow VESA EDID info to be accessed on x86");
 }
+
+#else /* (__linux__ || __NetBSD__ || __FreeBSD__ || __OpenBSD__) && __i386__ */
+
+/* Always returns false */
+static PyObject * vbe_get_edid_supported()
+{
+	return Py_BuildValue("i", 0);
+}
+
+static struct PyMethodDef module_methods[] = {
+	{"vbe_get_edid_supported", (PyCFunction)vbe_get_edid_supported, METH_NOARGS, "Dummy module - Not supported"},
+	{NULL, NULL, 0, NULL},
+};
+
+PyMODINIT_FUNC initvbe(void) {
+	PyObject *m;
+	m = Py_InitModule3("vbe", module_methods,"Dummy VBE module");
+}
+
+#endif /* (__linux__ || __NetBSD__ || __FreeBSD__ || __OpenBSD__) && __i386__ */



-- 
gentoo-commits@l.g.o mailing list