Moved old code into a separate directory

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

diff --git a/src/compat/linux-kd.h b/src/compat/linux-kd.h
new file mode 100644 (file)
index 0000000..f2d37f3
--- /dev/null
+++ b/src/compat/linux-kd.h
@@ -0,0 +1,112 @@
+/*
+ * Linux pre-0.96 introduced, and 1.1.63 removed the defines
+ * #define GIO_FONT8x8     0x4B28
+ * #define PIO_FONT8x8     0x4B29
+ * #define GIO_FONT8x14    0x4B2A
+ * #define PIO_FONT8x14    0x4B2B
+ * #define GIO_FONT8x16    0x4B2C
+ * #define PIO_FONT8x16    0x4B2D
+ * but these ioctls have never been implemented.
+ */
+
+/*
+ * Linux 0.99.14y introduces the GIO_FONT and PIO_FONT ioctls.
+ * Usage:
+       char buf[8192];
+       ioctl(fd, GIO_FONT, buf);
+ * to get 256*32=8192 bytes of data for 256 characters,
+ * 32 for each symbol, of which only the first H are used
+ * for an 8xH font.
+ * Changes in use: 1.1.74: you have to be root for PIO_FONT.
+ */
+#ifndef GIO_FONT
+#define GIO_FONT        0x4B60
+#define PIO_FONT        0x4B61
+#endif
+
+/*
+ * Linux 1.3.1 introduces 512-character fonts and the
+ * GIO_FONTX and PIO_FONTX ioctls to read and load them.
+ * The PIO_FONTX ioctl also adjusts screen character height.
+ * Usage:
+       char buf[16384];
+       struct consolefontdesc cfd;
+       cfd.charcount = fontsize;
+       cfd.charheight = height;
+       cfd.chardata = buf;
+       ioctl(fd, PIO_FONTX, &cfd);
+ * and
+       char buf[32*N];
+       cfd.charcount = N;
+       cfd.chardata = buf;
+       ioctl(fd, GIO_FONTX, &cfd);
+ * (where the ioctl will fail if N was too small);
+ * the ioctl fills cfd.charcount and cfd.charheight.
+ * With GIO_FONTX, the chardata pointer may be NULL.
+ * The old GIO_FONT will fail if the fontsize is 512.
+ */
+#ifndef GIO_FONTX
+#define GIO_FONTX  0x4B6B
+#define PIO_FONTX  0x4B6C
+struct consolefontdesc {
+       unsigned short charcount;
+       unsigned short charheight;
+       char *chardata;
+};
+#endif
+
+/*
+ * Linux 1.3.28 introduces the PIO_FONTRESET ioctl.
+ * Usage:
+       ioctl(fd, PIO_FONTRESET, 0);
+ * The default font is kept in slot 0 of the video card character ROM,
+ * and is never touched.
+ * A custom font is loaded in slot 2 (256 char) or 2:3 (512 char).
+ *
+ * However, 1.3.30 takes this away again by hiding it behind
+ * #ifndef BROKEN_GRAPHICS_PROGRAMS, while in fact this variable
+ * is defined (in vt_kern.h).  Now by default every font lives in
+ * slot 0 (256 char) or 0:1 (512 char).
+ * And these days (2.2pre), even if BROKEN_GRAPHICS_PROGRAMS is undefined,
+ * the PIO_FONTRESET does not work since it is not implemented for vgacon.
+ *
+ * In other words, this ioctl is totally useless today.
+ */
+#ifndef PIO_FONTRESET
+#define PIO_FONTRESET   0x4B6D  /* reset to default font */
+#endif
+
+/*
+ * Linux 2.1.111 introduces the KDFONTOP ioctl.
+ * Details of use have changed a bit in 2.1.111-115,124.
+ * Usage:
+       struct console_font_op cfo;
+       ioctl(fd, KDFONTOP, &cfo);
+ */
+#ifndef KDFONTOP
+#define KDFONTOP 0x4B72
+struct console_font_op {
+        unsigned int op;       /* KD_FONT_OP_* */
+        unsigned int flags;    /* KD_FONT_FLAG_* */
+        unsigned int width, height;
+        unsigned int charcount;
+        unsigned char *data;   /* font data with height fixed to 32 */
+};
+
+#define KD_FONT_OP_SET          0     /* Set font */
+#define KD_FONT_OP_GET          1     /* Get font */
+#define KD_FONT_OP_SET_DEFAULT  2     /* Set font to default,
+                                        data points to name / NULL */
+#define KD_FONT_OP_COPY         3     /* Copy from another console */
+
+#define KD_FONT_FLAG_OLD       0x80000000 /* Invoked via old interface */
+#define KD_FONT_FLAG_DONT_RECALC 1    /* Don't call adjust_height() */
+                         /* (Used internally for PIO_FONT support) */
+#endif /* KDFONTOP */
+
+#ifndef KDKBDREP
+/* usually defined in <linux/kd.h> */
+/* set keyboard delay/repeat rate;
+ * actually used values are returned */
+#define KDKBDREP        0x4B52
+#endif

diff --git a/src/compat/linux-keyboard.h b/src/compat/linux-keyboard.h
new file mode 100644 (file)
index 0000000..fcdfc30
--- /dev/null
+++ b/src/compat/linux-keyboard.h
@@ -0,0 +1,11 @@
+#ifndef KT_LETTER
+#define KT_LETTER KT_LATIN
+#endif
+
+#ifndef MAX_NR_KEYMAPS
+#define MAX_NR_KEYMAPS NR_KEYMAPS
+#endif
+
+#ifndef NR_KEYS
+#define NR_KEYS 256
+#endif

diff --git a/src/compat/linux-limits.h b/src/compat/linux-limits.h
new file mode 100644 (file)
index 0000000..a88e65f
--- /dev/null
+++ b/src/compat/linux-limits.h
@@ -0,0 +1,3 @@
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif

diff --git a/src/dumpkeys.c b/src/dumpkeys.c
index 326ec37..34d6bee 100644 (file)
--- a/src/dumpkeys.c
+++ b/src/dumpkeys.c
@@ -20,12 +20,8 @@
 #include "nls.h"
 #include "version.h"
 
-#ifndef KT_LETTER
-#define KT_LETTER KT_LATIN
-#endif
-
-#ifndef MAX_NR_KEYMAPS
-#define MAX_NR_KEYMAPS NR_KEYMAPS
+#ifdef COMPAT_HEADERS
+#include "compat/linux-keyboard.h"
 #endif
 
 static int fd;

diff --git a/src/kbdrate.c b/src/kbdrate.c
index 95ff723..8d0df5a 100644 (file)
--- a/src/kbdrate.c
+++ b/src/kbdrate.c
@@ -74,15 +74,14 @@ beats rebuilding the kernel!
 #include <errno.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
+#include <linux/kd.h>
 
 #ifdef __sparc__
 #include <asm/param.h>
 #endif
 
-#ifndef KDKBDREP
-/* usually defined in <linux/kd.h> */
-#define KDKBDREP        0x4B52  /* set keyboard delay/repeat rate;
-                                * actually used values are returned */
+#ifdef COMPAT_HEADERS
+#include "compat/linux-kd.h"
 #endif
 
 /* Equal to kernel version, but field names vary. */

diff --git a/src/kdfontop.c b/src/kdfontop.c
index 51158fd..88f5411 100644 (file)
--- a/src/kdfontop.c
+++ b/src/kdfontop.c
@@ -14,82 +14,8 @@
 #include "nls.h"
 #include "version.h"
 
-/*
- * Linux pre-0.96 introduced, and 1.1.63 removed the defines
- * #define GIO_FONT8x8     0x4B28
- * #define PIO_FONT8x8     0x4B29
- * #define GIO_FONT8x14    0x4B2A
- * #define PIO_FONT8x14    0x4B2B
- * #define GIO_FONT8x16    0x4B2C
- * #define PIO_FONT8x16    0x4B2D
- * but these ioctls have never been implemented.
- */
-
-/*
- * Linux 0.99.14y introduces the GIO_FONT and PIO_FONT ioctls.
- * Usage:
-       char buf[8192];
-       ioctl(fd, GIO_FONT, buf);
- * to get 256*32=8192 bytes of data for 256 characters,
- * 32 for each symbol, of which only the first H are used
- * for an 8xH font.
- * Changes in use: 1.1.74: you have to be root for PIO_FONT.
- */
-#ifndef GIO_FONT
-#define GIO_FONT        0x4B60
-#define PIO_FONT        0x4B61
-#endif
-
-/*
- * Linux 1.3.1 introduces 512-character fonts and the
- * GIO_FONTX and PIO_FONTX ioctls to read and load them.
- * The PIO_FONTX ioctl also adjusts screen character height.
- * Usage:
-       char buf[16384];
-       struct consolefontdesc cfd;
-       cfd.charcount = fontsize;
-       cfd.charheight = height;
-       cfd.chardata = buf;
-       ioctl(fd, PIO_FONTX, &cfd);
- * and
-       char buf[32*N];
-       cfd.charcount = N;
-       cfd.chardata = buf;
-       ioctl(fd, GIO_FONTX, &cfd);
- * (where the ioctl will fail if N was too small);
- * the ioctl fills cfd.charcount and cfd.charheight.
- * With GIO_FONTX, the chardata pointer may be NULL.
- * The old GIO_FONT will fail if the fontsize is 512.
- */
-#ifndef GIO_FONTX
-#define GIO_FONTX  0x4B6B
-#define PIO_FONTX  0x4B6C
-struct consolefontdesc {
-       unsigned short charcount;
-       unsigned short charheight;
-       char *chardata;
-};
-#endif
-
-/*
- * Linux 1.3.28 introduces the PIO_FONTRESET ioctl.
- * Usage:
-       ioctl(fd, PIO_FONTRESET, 0);
- * The default font is kept in slot 0 of the video card character ROM,
- * and is never touched.
- * A custom font is loaded in slot 2 (256 char) or 2:3 (512 char).
- *
- * However, 1.3.30 takes this away again by hiding it behind
- * #ifndef BROKEN_GRAPHICS_PROGRAMS, while in fact this variable
- * is defined (in vt_kern.h).  Now by default every font lives in
- * slot 0 (256 char) or 0:1 (512 char).
- * And these days (2.2pre), even if BROKEN_GRAPHICS_PROGRAMS is undefined,
- * the PIO_FONTRESET does not work since it is not implemented for vgacon.
- *
- * In other words, this ioctl is totally useless today.
- */
-#ifndef PIO_FONTRESET
-#define PIO_FONTRESET   0x4B6D  /* reset to default font */
+#ifdef COMPAT_HEADERS
+#include "compat/linux-kd.h"
 #endif
 
 int
@@ -101,34 +27,6 @@ restorefont(int fd) {
        return 0;
 }
 
-/*
- * Linux 2.1.111 introduces the KDFONTOP ioctl.
- * Details of use have changed a bit in 2.1.111-115,124.
- * Usage:
-       struct console_font_op cfo;
-       ioctl(fd, KDFONTOP, &cfo);
- */
-#ifndef KDFONTOP
-#define KDFONTOP 0x4B72
-struct console_font_op {
-        unsigned int op;       /* KD_FONT_OP_* */
-        unsigned int flags;    /* KD_FONT_FLAG_* */
-        unsigned int width, height;
-        unsigned int charcount;
-        unsigned char *data;   /* font data with height fixed to 32 */
-};
-
-#define KD_FONT_OP_SET          0     /* Set font */
-#define KD_FONT_OP_GET          1     /* Get font */
-#define KD_FONT_OP_SET_DEFAULT  2     /* Set font to default,
-                                        data points to name / NULL */
-#define KD_FONT_OP_COPY         3     /* Copy from another console */
-
-#define KD_FONT_FLAG_OLD       0x80000000 /* Invoked via old interface */
-#define KD_FONT_FLAG_DONT_RECALC 1    /* Don't call adjust_height() */
-                         /* (Used internally for PIO_FONT support) */
-#endif /* KDFONTOP */
-
 int
 font_charheight(unsigned char *buf, int count, int width) {
        int h, i, x;

diff --git a/src/loadkeys.y b/src/loadkeys.y
index 38f9dcf..a8413cb 100644 (file)
--- a/src/loadkeys.y
+++ b/src/loadkeys.y
@@ -37,6 +37,9 @@
 
 #include "loadkeys.analyze.h"
 
+#ifdef COMPAT_HEADERS
+#include "compat/linux-keyboard.h"
+
 #define U(x) ((x) ^ 0xf000)
 
 #ifdef KDSKBDIACRUC
@@ -45,13 +48,6 @@ typedef struct kbdiacruc accent_entry;
 typedef struct kbdiacr accent_entry;
 #endif
 
-#ifndef KT_LETTER
-#define KT_LETTER KT_LATIN
-#endif
-
-#undef NR_KEYS
-#define NR_KEYS 256
-
 /* What keymaps are we defining? */
 char defining[MAX_NR_KEYMAPS];
 char keymaps_line_seen = 0;

diff --git a/src/openvt.c b/src/openvt.c
index 0b81dea..ac1b85b 100644 (file)
--- a/src/openvt.c
+++ b/src/openvt.c
@@ -15,8 +15,8 @@
 #include "xmalloc.h"
 #include "getfd.h"
 
-#ifndef NAME_MAX
-#define NAME_MAX 255
+#ifdef COMPAT_HEADERS
+#include "compat/linux-limits.h"
 #endif
 
 // There must be a universal way to find these!