diff options
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/chvt.c | 4 | ||||
| -rw-r--r-- | console-tools/deallocvt.c | 2 | ||||
| -rw-r--r-- | console-tools/dumpkmap.c | 6 | ||||
| -rw-r--r-- | console-tools/loadfont.c | 12 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 6 | ||||
| -rw-r--r-- | console-tools/setkeycodes.c | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c index 76d4b53..c715e67 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c @@ -12,8 +12,8 @@ #include <sys/ioctl.h> /* From <linux/vt.h> */ -#define VT_ACTIVATE 0x5606 /* make vt active */ -#define VT_WAITACTIVE 0x5607 /* wait for vt active */ +static const int VT_ACTIVATE = 0x5606; /* make vt active */ +static const int VT_WAITACTIVE = 0x5607; /* wait for vt active */ int chvt_main(int argc, char **argv) { diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index 3dd90c0..fad7a2b 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c @@ -11,7 +11,7 @@ #include <sys/ioctl.h> /* From <linux/vt.h> */ -#define VT_DISALLOCATE 0x5608 /* free memory associated to vt */ +static const int VT_DISALLOCATE = 0x5608; /* free memory associated to vt */ int deallocvt_main(int argc, char *argv[]) { diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c index c5a2ea7..b438ba2 100644 --- a/console-tools/dumpkmap.c +++ b/console-tools/dumpkmap.c @@ -32,11 +32,11 @@ struct kbentry { unsigned char kb_index; unsigned short kb_value; }; -#define KDGKBENT 0x4B46 /* gets one entry in translation table */ +static const int KDGKBENT = 0x4B46; /* gets one entry in translation table */ /* From <linux/keyboard.h> */ -#define NR_KEYS 128 -#define MAX_NR_KEYMAPS 256 +static const int NR_KEYS = 128; +static const int MAX_NR_KEYMAPS = 256; int dumpkmap_main(int argc, char **argv) { diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index 13a196f..08e0761 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -21,13 +21,13 @@ #include <sys/kd.h> #include <endian.h> -#define PSF_MAGIC1 0x36 -#define PSF_MAGIC2 0x04 +static const int PSF_MAGIC1 = 0x36; +static const int PSF_MAGIC2 = 0x04; -#define PSF_MODE512 0x01 -#define PSF_MODEHASTAB 0x02 -#define PSF_MAXMODE 0x03 -#define PSF_SEPARATOR 0xFFFF +static const int PSF_MODE512 = 0x01; +static const int PSF_MODEHASTAB = 0x02; +static const int PSF_MAXMODE = 0x03; +static const int PSF_SEPARATOR = 0xFFFF; struct psf_header { unsigned char magic1, magic2; /* Magic number */ diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index fc24398..43c1cc7 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c @@ -34,11 +34,11 @@ struct kbentry { unsigned char kb_index; unsigned short kb_value; }; -#define KDSKBENT 0x4B47 /* sets one entry in translation table */ +static const int KDSKBENT = 0x4B47; /* sets one entry in translation table */ /* From <linux/keyboard.h> */ -#define NR_KEYS 128 -#define MAX_NR_KEYMAPS 256 +static const int NR_KEYS = 128; +static const int MAX_NR_KEYMAPS = 256; int loadkmap_main(int argc, char **argv) { diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index 7db398d..be9b1b7 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c @@ -33,7 +33,7 @@ struct kbkeycode { unsigned int scancode, keycode; }; -#define KDSETKEYCODE 0x4B4D /* write kernel keycode table entry */ +static const int KDSETKEYCODE = 0x4B4D; /* write kernel keycode table entry */ extern int setkeycodes_main(int argc, char** argv) |