From 3fe6b7002bf8da7ecd91c2ab4e8bfdec4e80e02f Mon Sep 17 00:00:00 2001
From: Myles Watson <mylesgw@gmail.com>
Date: Fri, 9 Oct 2009 20:13:43 +0000
Subject: Add const to get rid of some warnings when passing quoted strings.
 Remove an unused extern declaration.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4756 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/arch/i386/boot/acpi.c                         |  4 ++--
 src/arch/i386/boot/acpigen.c                      | 22 +++++++++++-----------
 src/arch/i386/include/arch/acpi.h                 |  6 +++---
 src/arch/i386/include/arch/acpigen.h              | 14 +++++++-------
 src/cpu/amd/model_fxx/processor_name.c            |  2 +-
 src/devices/root_device.c                         |  8 --------
 src/include/device/device.h                       |  6 +++++-
 src/include/pc80/mc146818rtc.h                    |  4 ++--
 src/mainboard/amd/dbm690t/acpi_tables.c           |  2 +-
 src/mainboard/amd/pistachio/acpi_tables.c         |  2 +-
 src/mainboard/amd/serengeti_cheetah/acpi_tables.c |  2 +-
 src/mainboard/asus/m2v-mx_se/acpi_tables.c        |  2 +-
 src/mainboard/gigabyte/m57sli/acpi_tables.c       |  2 +-
 src/mainboard/iwill/dk8_htx/acpi_tables.c         |  2 +-
 src/mainboard/kontron/986lcd-m/acpi_tables.c      |  2 +-
 src/mainboard/technexion/tim8690/acpi_tables.c    |  2 +-
 src/mainboard/tyan/s2891/acpi_tables.c            |  2 +-
 src/mainboard/tyan/s2892/acpi_tables.c            |  2 +-
 src/mainboard/tyan/s2895/acpi_tables.c            |  2 +-
 src/northbridge/amd/amdk8/amdk8_acpi.c            |  2 +-
 src/pc80/mc146818rtc.c                            |  2 +-
 21 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/src/arch/i386/boot/acpi.c b/src/arch/i386/boot/acpi.c
index baff4f0dd6..03634b4d96 100644
--- a/src/arch/i386/boot/acpi.c
+++ b/src/arch/i386/boot/acpi.c
@@ -224,11 +224,11 @@ void acpi_create_mcfg(acpi_mcfg_t *mcfg)
 /* this can be overriden by platform ACPI setup code,
    if it calls acpi_create_ssdt_generator */
 unsigned long __attribute__((weak)) acpi_fill_ssdt_generator(unsigned long current,
-						    char *oem_table_id) {
+						    const char *oem_table_id) {
 	return current;
 }
 
-void acpi_create_ssdt_generator(acpi_header_t *ssdt, char *oem_table_id)
+void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id)
 {
 	unsigned long current=(unsigned long)ssdt+sizeof(acpi_header_t);
 	memset((void *)ssdt, 0, sizeof(acpi_header_t));
diff --git a/src/arch/i386/boot/acpigen.c b/src/arch/i386/boot/acpigen.c
index 2ad2a92cde..777ec74253 100644
--- a/src/arch/i386/boot/acpigen.c
+++ b/src/arch/i386/boot/acpigen.c
@@ -114,7 +114,7 @@ int acpigen_write_qword(uint64_t data)
 	return 9;
 }
 
-int acpigen_write_name_byte(char *name, uint8_t val)
+int acpigen_write_name_byte(const char *name, uint8_t val)
 {
 	int len;
 	len = acpigen_write_name(name);
@@ -122,7 +122,7 @@ int acpigen_write_name_byte(char *name, uint8_t val)
 	return len;
 }
 
-int acpigen_write_name_dword(char *name, uint32_t val)
+int acpigen_write_name_dword(const char *name, uint32_t val)
 {
 	int len;
 	len = acpigen_write_name(name);
@@ -130,7 +130,7 @@ int acpigen_write_name_dword(char *name, uint32_t val)
 	return len;
 }
 
-int acpigen_write_name_qword(char *name, uint64_t val)
+int acpigen_write_name_qword(const char *name, uint64_t val)
 {
 	int len;
 	len = acpigen_write_name(name);
@@ -138,7 +138,7 @@ int acpigen_write_name_qword(char *name, uint64_t val)
 	return len;
 }
 
-int acpigen_emit_stream(char *data, int size)
+int acpigen_emit_stream(const char *data, int size)
 {
 	int i;
 	for (i = 0; i < size; i++) {
@@ -152,7 +152,7 @@ int acpigen_emit_stream(char *data, int size)
    and 5.3 of ACPI specs 3.0 for details
 */
 
-static int acpigen_emit_simple_namestring(char *name) {
+static int acpigen_emit_simple_namestring(const char *name) {
 	int i, len = 0;
 	char ud[] = "____";
 	for (i = 0; i < 4; i++) {
@@ -166,7 +166,7 @@ static int acpigen_emit_simple_namestring(char *name) {
 	return len;
 }
 
-static int acpigen_emit_double_namestring(char *name, int dotpos) {
+static int acpigen_emit_double_namestring(const char *name, int dotpos) {
 	int len = 0; 
 	/* mark dual name prefix */
 	len += acpigen_emit_byte(0x2e);
@@ -175,7 +175,7 @@ static int acpigen_emit_double_namestring(char *name, int dotpos) {
 	return len;
 }
 
-static int acpigen_emit_multi_namestring(char *name) {
+static int acpigen_emit_multi_namestring(const char *name) {
 	int len = 0, count = 0;
 	unsigned char *pathlen; 
 	/* mark multi name prefix */
@@ -199,9 +199,9 @@ static int acpigen_emit_multi_namestring(char *name) {
 }
 
 
-int acpigen_emit_namestring(char *namepath) {
+int acpigen_emit_namestring(const char *namepath) {
 	int dotcount = 0, i;
-	int dotpos;
+	int dotpos = 0;
 	int len = 0;
 
 	/* we can start with a \ */
@@ -237,7 +237,7 @@ int acpigen_emit_namestring(char *namepath) {
 	return len;
 }
 
-int acpigen_write_name(char *name)
+int acpigen_write_name(const char *name)
 {
 	int len;
 	/* name op */
@@ -245,7 +245,7 @@ int acpigen_write_name(char *name)
 	return len + acpigen_emit_namestring(name);
 }
 
-int acpigen_write_scope(char *name)
+int acpigen_write_scope(const char *name)
 {
 	int len;
 	/* scope op */
diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h
index f5668c343b..47a8a15947 100644
--- a/src/arch/i386/include/arch/acpi.h
+++ b/src/arch/i386/include/arch/acpi.h
@@ -336,9 +336,9 @@ unsigned long acpi_fill_madt(unsigned long current);
 unsigned long acpi_fill_mcfg(unsigned long current);
 unsigned long acpi_fill_srat(unsigned long current);
 unsigned long acpi_fill_slit(unsigned long current);
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id);
-void acpi_create_ssdt_generator(acpi_header_t *ssdt, char *oem_table_id);
-void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs,void *dsdt);
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id);
+void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id);
+void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt);
 
 /* These can be used by the target port */
 u8 acpi_checksum(u8 *table, u32 length);
diff --git a/src/arch/i386/include/arch/acpigen.h b/src/arch/i386/include/arch/acpigen.h
index 63c369d6a8..e672e34578 100644
--- a/src/arch/i386/include/arch/acpigen.h
+++ b/src/arch/i386/include/arch/acpigen.h
@@ -28,15 +28,15 @@ char *acpigen_get_current(void);
 int acpigen_write_package(int nr_el);
 int acpigen_write_byte(unsigned int data);
 int acpigen_emit_byte(unsigned char data);
-int acpigen_emit_stream(char *data, int size);
-int acpigen_emit_namestring(char *namepath);
+int acpigen_emit_stream(const char *data, int size);
+int acpigen_emit_namestring(const char *namepath);
 int acpigen_write_dword(unsigned int data);
 int acpigen_write_qword(uint64_t data);
-int acpigen_write_name(char *name);
-int acpigen_write_name_dword(char *name, uint32_t val);
-int acpigen_write_name_qword(char *name, uint64_t val);
-int acpigen_write_name_byte(char *name, uint8_t val);
-int acpigen_write_scope(char *name);
+int acpigen_write_name(const char *name);
+int acpigen_write_name_dword(const char *name, uint32_t val);
+int acpigen_write_name_qword(const char *name, uint64_t val);
+int acpigen_write_name_byte(const char *name, uint8_t val);
+int acpigen_write_scope(const char *name);
 int acpigen_write_PPC(u8 nr);
 int acpigen_write_empty_PCT(void);
 int acpigen_write_PSS_package(u32 coreFreq, u32 power, u32 transLat, u32 busmLat,
diff --git a/src/cpu/amd/model_fxx/processor_name.c b/src/cpu/amd/model_fxx/processor_name.c
index f5372cdf4a..3d4e38b42c 100644
--- a/src/cpu/amd/model_fxx/processor_name.c
+++ b/src/cpu/amd/model_fxx/processor_name.c
@@ -42,7 +42,7 @@
  */
 
 #if CONFIG_K8_REV_F_SUPPORT == 0
-static char *processor_names[]={
+static const char *processor_names[]={
 	/* 0x00 */ "AMD Engineering Sample",
 	/* 0x01-0x03 */ NULL, NULL, NULL,
 	/* 0x04 */ "AMD Athlon(tm) 64 Processor XX00+",
diff --git a/src/devices/root_device.c b/src/devices/root_device.c
index affb75b553..b8d56b646b 100644
--- a/src/devices/root_device.c
+++ b/src/devices/root_device.c
@@ -182,11 +182,3 @@ struct device_operations default_dev_ops_root = {
 	.scan_bus         = root_dev_scan_bus,
 	.reset_bus        = root_dev_reset,
 };
-
-/**
- * @brief The root of device tree.
- *
- * This is the root of the device tree. The device tree is defined in the
- * static.c file and is generated by config tool during compile time.
- */
-extern struct device dev_root;
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 06a9245145..5e0e19a2e5 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -90,7 +90,11 @@ struct device {
 	void *chip_info;
 };
 
-extern struct device	dev_root;	/* root bus */
+/**
+ * This is the root of the device tree. The device tree is defined in the
+ * static.c file and is generated by the config tool at compile time.
+ */
+extern struct device	dev_root;
 extern struct device	*all_devices;	/* list of all devices */
 
 
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index d510bd2d22..1561e4e811 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -95,9 +95,9 @@
 #if !defined(ASSEMBLY)
 void rtc_init(int invalid);
 #if CONFIG_USE_OPTION_TABLE == 1
-int get_option(void *dest, char *name);
+int get_option(void *dest, const char *name);
 #else
-static inline int get_option(void *dest, char *name) { return -2; }
+static inline int get_option(void *dest, const char *name) { return -2; }
 #endif
 #endif
 
diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index c61f97b98e..00a7c02769 100644
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -123,7 +123,7 @@ void update_ssdtx(void *ssdtx, int i)
 
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c
index 897246cae9..2e02462511 100644
--- a/src/mainboard/amd/pistachio/acpi_tables.c
+++ b/src/mainboard/amd/pistachio/acpi_tables.c
@@ -123,7 +123,7 @@ void update_ssdtx(void *ssdtx, int i)
 
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index 6bde4d5f43..9c59160cb6 100644
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -179,7 +179,7 @@ void update_ssdtx(void *ssdtx, int i)
 
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	return (unsigned long) (acpigen_get_current());
 }
diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
index ca1327af51..d8431c8ab5 100644
--- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c
+++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
@@ -82,7 +82,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) 
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id)
 {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(0, 0, 0);
diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c
index ecc063df18..791825c0d5 100644
--- a/src/mainboard/gigabyte/m57sli/acpi_tables.c
+++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c
@@ -93,7 +93,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) 
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id)
 {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(0, 0, 0);
diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c
index 12e0494939..619f11657f 100644
--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c
+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c
@@ -182,7 +182,7 @@ void update_ssdtx(void *ssdtx, int i)
 
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	return (unsigned long) (acpigen_get_current());
 }
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
index fae33c8700..0f5e704b1e 100644
--- a/src/mainboard/kontron/986lcd-m/acpi_tables.c
+++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c
@@ -176,7 +176,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id)
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id)
 {
 	generate_cpu_entries();
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c
index c61f97b98e..00a7c02769 100644
--- a/src/mainboard/technexion/tim8690/acpi_tables.c
+++ b/src/mainboard/technexion/tim8690/acpi_tables.c
@@ -123,7 +123,7 @@ void update_ssdtx(void *ssdtx, int i)
 
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/mainboard/tyan/s2891/acpi_tables.c b/src/mainboard/tyan/s2891/acpi_tables.c
index 0f4f76af20..07d46be0db 100644
--- a/src/mainboard/tyan/s2891/acpi_tables.c
+++ b/src/mainboard/tyan/s2891/acpi_tables.c
@@ -75,7 +75,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(0, 0, 0);
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/mainboard/tyan/s2892/acpi_tables.c b/src/mainboard/tyan/s2892/acpi_tables.c
index 0f4f76af20..07d46be0db 100644
--- a/src/mainboard/tyan/s2892/acpi_tables.c
+++ b/src/mainboard/tyan/s2892/acpi_tables.c
@@ -75,7 +75,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(0, 0, 0);
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/mainboard/tyan/s2895/acpi_tables.c b/src/mainboard/tyan/s2895/acpi_tables.c
index 99f7b9657c..43a80b6d5a 100644
--- a/src/mainboard/tyan/s2895/acpi_tables.c
+++ b/src/mainboard/tyan/s2895/acpi_tables.c
@@ -86,7 +86,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	return current;
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
 	k8acpi_write_vars();
 	amd_model_fxx_generate_powernow(0, 0, 0);
 	return (unsigned long) (acpigen_get_current());
diff --git a/src/northbridge/amd/amdk8/amdk8_acpi.c b/src/northbridge/amd/amdk8/amdk8_acpi.c
index 46b17db161..e7c9b5c0fc 100644
--- a/src/northbridge/amd/amdk8/amdk8_acpi.c
+++ b/src/northbridge/amd/amdk8/amdk8_acpi.c
@@ -248,7 +248,7 @@ static int k8acpi_write_HT(void) {
 	return len;
 }
 
-static int k8acpi_write_pci_data(int dlen, char *name, int offset) {
+static int k8acpi_write_pci_data(int dlen, const char *name, int offset) {
 	device_t dev;
 	uint32_t dword;
 	int len, lenp, i;
diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c
index 592a0a52f1..c39992bc2d 100644
--- a/src/pc80/mc146818rtc.c
+++ b/src/pc80/mc146818rtc.c
@@ -231,7 +231,7 @@ static int get_cmos_value(unsigned long bit, unsigned long length, void *vret)
 	return 0;
 }
 
-int get_option(void *dest, char *name)
+int get_option(void *dest, const char *name)
 {
 	extern struct cmos_option_table option_table;
 	struct cmos_option_table *ct;
-- 
cgit v1.2.3