summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO11
-rw-r--r--src/qxl.h18
-rw-r--r--src/qxl_driver.c1
-rw-r--r--src/qxl_mem.c1
-rw-r--r--src/qxl_mem.h15
5 files changed, 26 insertions, 20 deletions
diff --git a/TODO b/TODO
index d491118..a65fab0 100644
--- a/TODO
+++ b/TODO
@@ -3,9 +3,6 @@
- Split out ring code into qxl_ring.c
-- Get rid of qxl_mem.h header; just use qxl.h
-
-
Question:
- What is the "vram" PCI range used for?
@@ -17,3 +14,11 @@ Question:
Does Windows itself use that ioctl, and if so, for what. The area
is only 32K in size so it can't really be used for any realistic
bitmaps.
+
+-=-=-=-=-
+
+Done:
+
+- Get rid of qxl_mem.h header; just use qxl.h
+
+
diff --git a/src/qxl.h b/src/qxl.h
index 86124d7..586e282 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -44,6 +44,24 @@
#define PCI_CHIP_QXL_0100 0x0100
+/* qxl_mem.c:
+ *
+ * An implementation of malloc()/free() for the io pages.
+ *
+ * The implementation in the Windows drivers is based on
+ * the Doug Lea malloc. This one is really simple, at least
+ * for now.
+ */
+#include <stdint.h>
+#include <stdlib.h>
+
+struct qxl_mem;
+
+struct qxl_mem *qxl_mem_create (void *base, unsigned long n_bytes);
+
+void *qxl_alloc (struct qxl_mem *mem, unsigned long n_bytes);
+void qxl_free (struct qxl_mem *mem, void *d);
+
#pragma pack(push,1)
/* I/O port definitions */
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index ca1e192..220e54f 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -29,7 +29,6 @@
#include <unistd.h>
#include "qxl.h"
-#include "qxl_mem.h"
#define qxlSaveState(x) do {} while (0)
#define qxlRestoreState(x) do {} while (0)
diff --git a/src/qxl_mem.c b/src/qxl_mem.c
index 6985d91..727517d 100644
--- a/src/qxl_mem.c
+++ b/src/qxl_mem.c
@@ -1,5 +1,4 @@
#include "qxl.h"
-#include "qxl_mem.h"
#include <assert.h>
#include <stdio.h>
diff --git a/src/qxl_mem.h b/src/qxl_mem.h
deleted file mode 100644
index 5b19e87..0000000
--- a/src/qxl_mem.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* An implementation of malloc()/free() for the io pages.
- *
- * The implementation in the Windows drivers is based on
- * the Doug Lea malloc. This one is really simple, at least
- * for now.
- */
-#include <stdint.h>
-#include <stdlib.h>
-
-struct qxl_mem;
-
-struct qxl_mem *qxl_mem_create (void *base, unsigned long n_bytes);
-
-void *qxl_alloc (struct qxl_mem *mem, unsigned long n_bytes);
-void qxl_free (struct qxl_mem *mem, void *d);