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

4 files changed, 23 insertions, 23 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,