Changeset 565Tweet

Timestamp:

Mar 9, 2006, 1:41:02 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Pure VGA output driver.

Location:

libcaca/trunk/caca

Files:

• caca.c (modified) (3 diffs)
• caca_internals.h (modified) (3 diffs)
• driver_vga.c (added)

libcaca/trunk/caca/caca.c

@@ -22 +22 @@
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
+#if !defined(__KERNEL__)
+#   include <stdlib.h>
+#   include <string.h>
+#endif
 
 #include "cucul.h"
@@ -152 +154 @@
         else
 #endif
+#if defined(USE_VGA)
+        if(!strcasecmp(var, "vga"))
+            vga_init_driver(kk);
+        else
+#endif
             return -1;
 
@@ -164 +171 @@
 #if defined(USE_CONIO)
     conio_init_driver(kk);
+    return 0;
+#endif
+#if defined(USE_VGA)
+    vga_init_driver(kk);
     return 0;
 #endif

libcaca/trunk/caca/caca_internals.h

@@ -21 +21 @@
 #define __CACA_INTERNALS_H__
 
-#if defined(HAVE_INTTYPES_H) || defined(_DOXYGEN_SKIP_ME)
+#if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
 #   include <inttypes.h>
-#elif !defined(CUSTOM_INTTYPES)
+#elif !defined(CUSTOM_INTTYPES) && !defined(_DOXYGEN_SKIP_ME)
 #   define CUSTOM_INTTYPES
 typedef unsigned char uint8_t;
@@ -58 +58 @@
     CACA_DRIVER_NETWORK = 7,
 #endif
+#if defined(USE_VGA)
+    CACA_DRIVER_VGA = 8,
+#endif
     CACA_DRIVER_NONE = 0
 };
@@ -82 +85 @@
 #if defined(USE_NETWORK)
 void network_init_driver(caca_t *);
+#endif
+#if defined(USE_VGA)
+void vga_init_driver(caca_t *);
 #endif
 /* Timer structure */