From 58d21fb1c277951c4a7ffbae393cec24de1f95fa Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Tue, 23 Dec 2008 10:15:14 +0000 Subject: [PATCH] Change part_length to a define git-svn-id: svn://coreboot.org/openbios/openbios-devel@312 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/ppc/qemu/init.c | 2 +- drivers/adb.c | 2 +- drivers/kbd.c | 4 ++-- drivers/kbd.h | 4 ++-- drivers/pci.c | 2 +- include/openbios/pci.h | 2 +- modules/font_8x8.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index e61c8b0..c5c35fd 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -46,7 +46,7 @@ enum { ARCH_HEATHROW, }; -static pci_arch_t known_arch[] = { +static const pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, 0x80000000, 0x00010000, 0x00000000, 0x00400000, diff --git a/drivers/adb.c b/drivers/adb.c index 6028cb0..03d94e5 100644 --- a/drivers/adb.c +++ b/drivers/adb.c @@ -65,7 +65,7 @@ NODE_METHODS( keyboard ) = { */ -static keymap_t ADB_kbd_us[] = { +static const keymap_t ADB_kbd_us[] = { /* 0x00 */ { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/drivers/kbd.c b/drivers/kbd.c index b0c724b..9891ae8 100644 --- a/drivers/kbd.c +++ b/drivers/kbd.c @@ -30,7 +30,7 @@ do { printk("KBD - %s: " fmt, __func__ , ##args); } while (0) #define KBD_DPRINTF(fmt, args...) do { } while (0) #endif -int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap) +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap) { kbd->nb_keys = nb_keys; kbd->keymap = keymap; @@ -40,7 +40,7 @@ int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap) int kbd_translate_key (kbd_t *kbd, int keycode, int up_down) { - keymap_t *keyt; + const keymap_t *keyt; int mod_state, key, type; int ret; diff --git a/drivers/kbd.h b/drivers/kbd.h index 64deb79..63b6103 100644 --- a/drivers/kbd.h +++ b/drivers/kbd.h @@ -34,7 +34,7 @@ struct kbd_t { * Right modifiers -----------+ */ int nb_keys; - keymap_t *keymap; + const keymap_t *keymap; }; /* Modifiers */ @@ -97,7 +97,7 @@ struct keymap_t { }; void *kbd_new (int len); -int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap); +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap); int kbd_translate_key (kbd_t *kbd, int keycode, int up_down); #endif /* !defined (__OHW_KBD_H__) */ diff --git a/drivers/pci.c b/drivers/pci.c index 310a1b2..e665233 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -33,7 +33,7 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); -pci_arch_t *arch; +const pci_arch_t *arch; static void ob_pci_open(int *idx) diff --git a/include/openbios/pci.h b/include/openbios/pci.h index 5c11acf..89a4e8c 100644 --- a/include/openbios/pci.h +++ b/include/openbios/pci.h @@ -21,6 +21,6 @@ struct pci_arch_t { unsigned long rlen; }; -extern pci_arch_t *arch; +extern const pci_arch_t *arch; #endif /* _H_PCI */ diff --git a/modules/font_8x8.c b/modules/font_8x8.c index 756fc43..ff643af 100644 --- a/modules/font_8x8.c +++ b/modules/font_8x8.c @@ -8,7 +8,7 @@ #define FONT_WIDTH 8 #define FONT_HEIGHT 8 -static unsigned char fontdata[FONTDATAMAX] = { +static const unsigned char fontdata[FONTDATAMAX] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */