X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=payloads%2Flibpayload%2Fdrivers%2Fusb%2Fusbhid.c;h=57f60cfe8071f783fed9c4401fe34bd466683965;hb=c4716b4ebfbcc970bf16f4c74e812fbbb8f00124;hp=84de0c8afb7e84009a665cb3dbd5e188d9c1b47e;hpb=14e22779625de673569c7b950ecc2753fb915b31;p=coreboot.git

diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c
index 84de0c8af..57f60cfe8 100644
--- a/payloads/libpayload/drivers/usb/usbhid.c
+++ b/payloads/libpayload/drivers/usb/usbhid.c
@@ -37,9 +37,7 @@ typedef enum { hid_proto_boot = 0, hid_proto_report = 1 } hid_proto;
 enum { hid_boot_proto_none = 0, hid_boot_proto_keyboard =
 		1, hid_boot_proto_mouse = 2
 };
-#ifdef USB_DEBUG
 static const char *boot_protos[3] = { "(none)", "keyboard", "mouse" };
-#endif
 enum { GET_REPORT = 0x1, GET_IDLE = 0x2, GET_PROTOCOL = 0x3, SET_REPORT =
 		0x9, SET_IDLE = 0xa, SET_PROTOCOL = 0xb
 };
@@ -62,7 +60,7 @@ static int keycount;
 #define KEYBOARD_BUFFER_SIZE 16
 static short keybuffer[KEYBOARD_BUFFER_SIZE];
 
-char *countries[36][2] = {
+const char *countries[36][2] = {
 	{ "not supported", "us" },
 	{ "Arabic", "ae" },
 	{ "Belgian", "be" },
@@ -105,13 +103,13 @@ char *countries[36][2] = {
 
 
 struct layout_maps {
-	char *country;
-	short map[4][0x80];
+	const char *country;
+	const short map[4][0x80];
 };
 
-static struct layout_maps *map;
+static const struct layout_maps *map;
 
-static struct layout_maps keyboard_layouts[] = {
+static const struct layout_maps keyboard_layouts[] = {
 // #ifdef CONFIG_PC_KEYBOARD_LAYOUT_US
 { .country = "us", .map = {
 	{ /* No modifier */
@@ -378,7 +376,7 @@ static struct console_input_driver cons = {
 };
 
 
-int usb_hid_set_layout (char *country)
+static int usb_hid_set_layout (const char *country)
 {
 	/* FIXME should be per keyboard */
 	int i;
@@ -394,7 +392,7 @@ int usb_hid_set_layout (char *country)
 		return 0;
 	}
 
-	printf("Keyboard layout '%s' not found, using '%s'\n",
+	printf("  Keyboard layout '%s' not found, using '%s'\n",
 			country, map->country);
 
 	/* Nothing found, not changed */
@@ -438,7 +436,7 @@ usb_hid_init (usbdev_t *dev)
 			/* 35 countries defined: */
 			if (countrycode > 35)
 				countrycode = 0;
-			printf ("  Keyboard has %s layout (country code %02x)\n",
+			debug ("  Keyboard has %s layout (country code %02x)\n",
 					countries[countrycode][0], countrycode);
 
 			/* Set keyboard layout accordingly */
@@ -464,7 +462,7 @@ usb_hid_init (usbdev_t *dev)
 			debug ("  configuration done.\n");
 			break;
 		case hid_boot_proto_mouse:
-			printf("NOTICE: USB mice are not supported.\n");
+			debug("NOTICE: USB mice are not supported.\n");
 			break;
 		}
 	}