ACPICA: De-macroize calls to standard C library functions
authorBob Moore <robert.moore@intel.com>
Wed, 1 Jul 2015 06:45:11 +0000 (14:45 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 1 Jul 2015 21:17:55 +0000 (23:17 +0200)
ACPICA commit 3b1026e0bdd3c32eb6d5d313f3ba0b1fee7597b4
ACPICA commit 00f0dc83f5cfca53b27a3213ae0d7719b88c2d6b
ACPICA commit 47d22a738d0e19fd241ffe4e3e9d4e198e4afc69

Across all of ACPICA. Replace C library macros such as ACPI_STRLEN with the
standard names such as strlen. The original purpose for these macros is
long since obsolete.
Also cast various invocations as necessary. Bob Moore, Jung-uk Kim, Lv Zheng.

Link: https://github.com/acpica/acpica/commit/3b1026e0
Link: https://github.com/acpica/acpica/commit/00f0dc83
Link: https://github.com/acpica/acpica/commit/47d22a73
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
56 files changed:
drivers/acpi/acpica/acutils.h
drivers/acpi/acpica/dsfield.c
drivers/acpi/acpica/dsinit.c
drivers/acpi/acpica/dsobject.c
drivers/acpi/acpica/dsutils.c
drivers/acpi/acpica/evgpeinit.c
drivers/acpi/acpica/exconfig.c
drivers/acpi/acpica/exconvrt.c
drivers/acpi/acpica/exfield.c
drivers/acpi/acpica/exfldio.c
drivers/acpi/acpica/exmisc.c
drivers/acpi/acpica/exnames.c
drivers/acpi/acpica/exoparg2.c
drivers/acpi/acpica/exoparg3.c
drivers/acpi/acpica/exregion.c
drivers/acpi/acpica/exstorob.c
drivers/acpi/acpica/nsaccess.c
drivers/acpi/acpica/nsconvert.c
drivers/acpi/acpica/nsdump.c
drivers/acpi/acpica/nseval.c
drivers/acpi/acpica/nsinit.c
drivers/acpi/acpica/nsrepair2.c
drivers/acpi/acpica/nsutils.c
drivers/acpi/acpica/nsxfeval.c
drivers/acpi/acpica/nsxfname.c
drivers/acpi/acpica/psutils.c
drivers/acpi/acpica/rscreate.c
drivers/acpi/acpica/rsmisc.c
drivers/acpi/acpica/rsutils.c
drivers/acpi/acpica/rsxface.c
drivers/acpi/acpica/tbdata.c
drivers/acpi/acpica/tbfadt.c
drivers/acpi/acpica/tbfind.c
drivers/acpi/acpica/tbinstal.c
drivers/acpi/acpica/tbprint.c
drivers/acpi/acpica/tbutils.c
drivers/acpi/acpica/tbxface.c
drivers/acpi/acpica/tbxfload.c
drivers/acpi/acpica/utalloc.c
drivers/acpi/acpica/utbuffer.c
drivers/acpi/acpica/utcache.c
drivers/acpi/acpica/utcopy.c
drivers/acpi/acpica/utids.c
drivers/acpi/acpica/utmisc.c
drivers/acpi/acpica/utosi.c
drivers/acpi/acpica/utpredef.c
drivers/acpi/acpica/utprint.c
drivers/acpi/acpica/utstring.c
drivers/acpi/acpica/uttrack.c
drivers/acpi/acpica/utxface.c
include/acpi/actypes.h
include/acpi/platform/acenv.h
tools/power/acpi/common/getopt.c
tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
tools/power/acpi/tools/acpidump/apdump.c
tools/power/acpi/tools/acpidump/apfiles.c

index 6391c9706e8492a8bd9ab38f8a135ac2ecd55079..ef1e51d0f038e94201f8827eb20f74c59937ab15 100644 (file)
@@ -210,37 +210,35 @@ void acpi_ut_subsystem_shutdown(void);
  */
 #ifndef ACPI_USE_SYSTEM_CLIBRARY
 
-acpi_size acpi_ut_strlen(const char *string);
+acpi_size strlen(const char *string);
 
-char *acpi_ut_strchr(const char *string, int ch);
+char *strchr(const char *string, int ch);
 
-char *acpi_ut_strcpy(char *dst_string, const char *src_string);
+char *strcpy(char *dst_string, const char *src_string);
 
-char *acpi_ut_strncpy(char *dst_string,
-                     const char *src_string, acpi_size count);
+char *strncpy(char *dst_string, const char *src_string, acpi_size count);
 
-int acpi_ut_memcmp(const char *buffer1, const char *buffer2, acpi_size count);
+int strncmp(const char *string1, const char *string2, acpi_size count);
 
-int acpi_ut_strncmp(const char *string1, const char *string2, acpi_size count);
+int strcmp(const char *string1, const char *string2);
 
-int acpi_ut_strcmp(const char *string1, const char *string2);
+char *strcat(char *dst_string, const char *src_string);
 
-char *acpi_ut_strcat(char *dst_string, const char *src_string);
+char *strncat(char *dst_string, const char *src_string, acpi_size count);
 
-char *acpi_ut_strncat(char *dst_string,
-                     const char *src_string, acpi_size count);
+u32 strtoul(const char *string, char **terminator, u32 base);
 
-u32 acpi_ut_strtoul(const char *string, char **terminator, u32 base);
+char *strstr(char *string1, char *string2);
 
-char *acpi_ut_strstr(char *string1, char *string2);
+int memcmp(void *buffer1, void *buffer2, acpi_size count);
 
-void *acpi_ut_memcpy(void *dest, const void *src, acpi_size count);
+void *memcpy(void *dest, const void *src, acpi_size count);
 
-void *acpi_ut_memset(void *dest, u8 value, acpi_size count);
+void *memset(void *dest, int value, acpi_size count);
 
-int acpi_ut_to_upper(int c);
+int toupper(int c);
 
-int acpi_ut_to_lower(int c);
+int tolower(int c);
 
 extern const u8 _acpi_ctype[];
 
@@ -255,13 +253,13 @@ extern const u8 _acpi_ctype[];
 #define _ACPI_UP     0x01      /* 'A'-'Z' */
 #define _ACPI_XD     0x80      /* '0'-'9', 'A'-'F', 'a'-'f' */
 
-#define ACPI_IS_DIGIT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_DI))
-#define ACPI_IS_SPACE(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_SP))
-#define ACPI_IS_XDIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD))
-#define ACPI_IS_UPPER(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP))
-#define ACPI_IS_LOWER(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO))
-#define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_XS | _ACPI_PU))
-#define ACPI_IS_ALPHA(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
+#define isdigit(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_DI))
+#define isspace(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_SP))
+#define isxdigit(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD))
+#define isupper(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP))
+#define islower(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO))
+#define isprint(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_XS | _ACPI_PU))
+#define isalpha(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
 
 #endif                         /* !ACPI_USE_SYSTEM_CLIBRARY */
 
index 43b40de90484cbb9f44338bb2d74dbb4bf4af291..20de148594fdc0459e1ddd589abe999f71c0003f 100644 (file)
@@ -502,7 +502,7 @@ acpi_ds_create_field(union acpi_parse_object *op,
                }
        }
 
-       ACPI_MEMSET(&info, 0, sizeof(struct acpi_create_field_info));
+       memset(&info, 0, sizeof(struct acpi_create_field_info));
 
        /* Second arg is the field flags */
 
index bbe74bcebbae882f2bb1da3211b4f4aad347534c..95779e8ec3bb2ab16eb69b8d14a729812aef8df4 100644 (file)
@@ -207,7 +207,7 @@ acpi_ds_initialize_objects(u32 table_index,
 
        /* Set all init info to zero */
 
-       ACPI_MEMSET(&info, 0, sizeof(struct acpi_init_walk_info));
+       memset(&info, 0, sizeof(struct acpi_init_walk_info));
 
        info.owner_id = owner_id;
        info.table_index = table_index;
index 4a4b2f343713f0f92b607544a0a560f558718e50..2beb7fd674ae14a20b43031254d874afbd859886 100644 (file)
@@ -339,8 +339,8 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
                /* Initialize buffer from the byte_list (if present) */
 
                if (byte_list) {
-                       ACPI_MEMCPY(obj_desc->buffer.pointer,
-                                   byte_list->named.data, byte_list_length);
+                       memcpy(obj_desc->buffer.pointer, byte_list->named.data,
+                              byte_list_length);
                }
        }
 
@@ -750,8 +750,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
        case ACPI_TYPE_STRING:
 
                obj_desc->string.pointer = op->common.value.string;
-               obj_desc->string.length =
-                   (u32)ACPI_STRLEN(op->common.value.string);
+               obj_desc->string.length = (u32)strlen(op->common.value.string);
 
                /*
                 * The string is contained in the ACPI table, don't ever try
index deeddd6d2f0523fbc5aff635acf63c3794a11b23..ebc577baeaf9fb14e29796a9286d22ca107fa6b5 100644 (file)
@@ -572,8 +572,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                        obj_desc =
                                            acpi_ut_create_string_object((acpi_size) name_length);
 
-                                       ACPI_STRNCPY(obj_desc->string.pointer,
-                                                    name_string, name_length);
+                                       strncpy(obj_desc->string.pointer,
+                                               name_string, name_length);
                                        status = AE_OK;
                                } else {
                                        /*
index 8840296d5b205080045de3fd93a97f046bcb91f5..ea4c0d3fca2d820edfbdb219f33d9718f32cb734 100644 (file)
@@ -377,7 +377,7 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
 
        /* 4) The last two characters of the name are the hex GPE Number */
 
-       gpe_number = ACPI_STRTOUL(&name[2], NULL, 16);
+       gpe_number = strtoul(&name[2], NULL, 16);
        if (gpe_number == ACPI_UINT32_MAX) {
 
                /* Conversion failed; invalid method, just ignore it */
index 6e0df2b9d5a475f329f2d40bfda2b592a26b764c..24a4c5c2b124825b5616371882ffa0f9666cdc85 100644 (file)
@@ -470,7 +470,7 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
 
-               ACPI_MEMCPY(table, table_header, length);
+               memcpy(table, table_header, length);
                break;
 
        default:
index 89a976b4ccf2ad9f8d01ed702b2288d5080c64a2..075d654c837f27e767ebed874e68140b97fc12ff 100644 (file)
@@ -227,9 +227,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                /* Copy the integer to the buffer, LSB first */
 
                new_buf = return_desc->buffer.pointer;
-               ACPI_MEMCPY(new_buf,
-                           &obj_desc->integer.value,
-                           acpi_gbl_integer_byte_width);
+               memcpy(new_buf,
+                      &obj_desc->integer.value, acpi_gbl_integer_byte_width);
                break;
 
        case ACPI_TYPE_STRING:
@@ -252,8 +251,8 @@ acpi_ex_convert_to_buffer(union acpi_operand_object *obj_desc,
                /* Copy the string to the buffer */
 
                new_buf = return_desc->buffer.pointer;
-               ACPI_STRNCPY((char *)new_buf, (char *)obj_desc->string.pointer,
-                            obj_desc->string.length);
+               strncpy((char *)new_buf, (char *)obj_desc->string.pointer,
+                       obj_desc->string.length);
                break;
 
        default:
index c161dd974f741c1700c501fa6576585034c67e43..61fd9c7b88bc508360ab4d96a034b8ac41bcca65 100644 (file)
@@ -428,7 +428,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
                }
 
                buffer = buffer_desc->buffer.pointer;
-               ACPI_MEMCPY(buffer, source_desc->buffer.pointer, length);
+               memcpy(buffer, source_desc->buffer.pointer, length);
 
                /* Lock entire transaction if requested */
 
index 725a3746a2df095163e5c10ca35077cf8afbb72c..70b7bbbb860b216aaeeb5e520cb5e253fc9b8f6b 100644 (file)
@@ -416,22 +416,22 @@ acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
                         * Copy the data from the source buffer.
                         * Length is the field width in bytes.
                         */
-                       ACPI_MEMCPY(value,
-                                   (obj_desc->buffer_field.buffer_obj)->buffer.
-                                   pointer +
-                                   obj_desc->buffer_field.base_byte_offset +
-                                   field_datum_byte_offset,
-                                   obj_desc->common_field.access_byte_width);
+                       memcpy(value,
+                              (obj_desc->buffer_field.buffer_obj)->buffer.
+                              pointer +
+                              obj_desc->buffer_field.base_byte_offset +
+                              field_datum_byte_offset,
+                              obj_desc->common_field.access_byte_width);
                } else {
                        /*
                         * Copy the data to the target buffer.
                         * Length is the field width in bytes.
                         */
-                       ACPI_MEMCPY((obj_desc->buffer_field.buffer_obj)->buffer.
-                                   pointer +
-                                   obj_desc->buffer_field.base_byte_offset +
-                                   field_datum_byte_offset, value,
-                                   obj_desc->common_field.access_byte_width);
+                       memcpy((obj_desc->buffer_field.buffer_obj)->buffer.
+                              pointer +
+                              obj_desc->buffer_field.base_byte_offset +
+                              field_datum_byte_offset, value,
+                              obj_desc->common_field.access_byte_width);
                }
 
                status = AE_OK;
@@ -703,7 +703,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
                return_ACPI_STATUS(AE_BUFFER_OVERFLOW);
        }
 
-       ACPI_MEMSET(buffer, 0, buffer_length);
+       memset(buffer, 0, buffer_length);
        access_bit_width = ACPI_MUL_8(obj_desc->common_field.access_byte_width);
 
        /* Handle the simple case here */
@@ -720,7 +720,7 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
                        status =
                            acpi_ex_field_datum_io(obj_desc, 0, &raw_datum,
                                                   ACPI_READ);
-                       ACPI_MEMCPY(buffer, &raw_datum, buffer_length);
+                       memcpy(buffer, &raw_datum, buffer_length);
                }
 
                return_ACPI_STATUS(status);
@@ -793,9 +793,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 
                /* Write merged datum to target buffer */
 
-               ACPI_MEMCPY(((char *)buffer) + buffer_offset, &merged_datum,
-                           ACPI_MIN(obj_desc->common_field.access_byte_width,
-                                    buffer_length - buffer_offset));
+               memcpy(((char *)buffer) + buffer_offset, &merged_datum,
+                      ACPI_MIN(obj_desc->common_field.access_byte_width,
+                               buffer_length - buffer_offset));
 
                buffer_offset += obj_desc->common_field.access_byte_width;
                merged_datum =
@@ -811,9 +811,9 @@ acpi_ex_extract_from_field(union acpi_operand_object *obj_desc,
 
        /* Write the last datum to the buffer */
 
-       ACPI_MEMCPY(((char *)buffer) + buffer_offset, &merged_datum,
-                   ACPI_MIN(obj_desc->common_field.access_byte_width,
-                            buffer_length - buffer_offset));
+       memcpy(((char *)buffer) + buffer_offset, &merged_datum,
+              ACPI_MIN(obj_desc->common_field.access_byte_width,
+                       buffer_length - buffer_offset));
 
        return_ACPI_STATUS(AE_OK);
 }
@@ -878,7 +878,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                 * at Byte zero. All unused (upper) bytes of the
                 * buffer will be 0.
                 */
-               ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length);
+               memcpy((char *)new_buffer, (char *)buffer, buffer_length);
                buffer = new_buffer;
                buffer_length = required_length;
        }
@@ -918,9 +918,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
        /* Get initial Datum from the input buffer */
 
-       ACPI_MEMCPY(&raw_datum, buffer,
-                   ACPI_MIN(obj_desc->common_field.access_byte_width,
-                            buffer_length - buffer_offset));
+       memcpy(&raw_datum, buffer,
+              ACPI_MIN(obj_desc->common_field.access_byte_width,
+                       buffer_length - buffer_offset));
 
        merged_datum =
            raw_datum << obj_desc->common_field.start_field_bit_offset;
@@ -970,9 +970,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
                /* Get the next input datum from the buffer */
 
                buffer_offset += obj_desc->common_field.access_byte_width;
-               ACPI_MEMCPY(&raw_datum, ((char *)buffer) + buffer_offset,
-                           ACPI_MIN(obj_desc->common_field.access_byte_width,
-                                    buffer_length - buffer_offset));
+               memcpy(&raw_datum, ((char *)buffer) + buffer_offset,
+                      ACPI_MIN(obj_desc->common_field.access_byte_width,
+                               buffer_length - buffer_offset));
 
                merged_datum |=
                    raw_datum << obj_desc->common_field.start_field_bit_offset;
index b56fc9d6f48e3a1180fd234d1e9eacf811202454..d02afece0f103ae9034d54657b9ef2a3ca686d9b 100644 (file)
@@ -209,8 +209,8 @@ acpi_ex_concat_template(union acpi_operand_object *operand0,
         * end_tag descriptor is copied from Operand1.
         */
        new_buf = return_desc->buffer.pointer;
-       ACPI_MEMCPY(new_buf, operand0->buffer.pointer, length0);
-       ACPI_MEMCPY(new_buf + length0, operand1->buffer.pointer, length1);
+       memcpy(new_buf, operand0->buffer.pointer, length0);
+       memcpy(new_buf + length0, operand1->buffer.pointer, length1);
 
        /* Insert end_tag and set the checksum to zero, means "ignore checksum" */
 
@@ -318,14 +318,14 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                /* Copy the first integer, LSB first */
 
-               ACPI_MEMCPY(new_buf, &operand0->integer.value,
-                           acpi_gbl_integer_byte_width);
+               memcpy(new_buf, &operand0->integer.value,
+                      acpi_gbl_integer_byte_width);
 
                /* Copy the second integer (LSB first) after the first */
 
-               ACPI_MEMCPY(new_buf + acpi_gbl_integer_byte_width,
-                           &local_operand1->integer.value,
-                           acpi_gbl_integer_byte_width);
+               memcpy(new_buf + acpi_gbl_integer_byte_width,
+                      &local_operand1->integer.value,
+                      acpi_gbl_integer_byte_width);
                break;
 
        case ACPI_TYPE_STRING:
@@ -346,9 +346,9 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                /* Concatenate the strings */
 
-               ACPI_STRCPY(new_buf, operand0->string.pointer);
-               ACPI_STRCPY(new_buf + operand0->string.length,
-                           local_operand1->string.pointer);
+               strcpy(new_buf, operand0->string.pointer);
+               strcpy(new_buf + operand0->string.length,
+                      local_operand1->string.pointer);
                break;
 
        case ACPI_TYPE_BUFFER:
@@ -369,11 +369,11 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
 
                /* Concatenate the buffers */
 
-               ACPI_MEMCPY(new_buf, operand0->buffer.pointer,
-                           operand0->buffer.length);
-               ACPI_MEMCPY(new_buf + operand0->buffer.length,
-                           local_operand1->buffer.pointer,
-                           local_operand1->buffer.length);
+               memcpy(new_buf, operand0->buffer.pointer,
+                      operand0->buffer.length);
+               memcpy(new_buf + operand0->buffer.length,
+                      local_operand1->buffer.pointer,
+                      local_operand1->buffer.length);
                break;
 
        default:
@@ -660,9 +660,9 @@ acpi_ex_do_logical_op(u16 opcode,
 
                /* Lexicographic compare: compare the data bytes */
 
-               compare = ACPI_MEMCMP(operand0->buffer.pointer,
-                                     local_operand1->buffer.pointer,
-                                     (length0 > length1) ? length1 : length0);
+               compare = memcmp(operand0->buffer.pointer,
+                                local_operand1->buffer.pointer,
+                                (length0 > length1) ? length1 : length0);
 
                switch (opcode) {
                case AML_LEQUAL_OP:     /* LEqual (Operand0, Operand1) */
index 453b00c301773fbb9977efc583f5a9163e54462a..20e87813c7d7c6b304c2bc2cbebb6b2ec370eb13 100644 (file)
@@ -192,7 +192,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
                char_buf[4] = '\0';
 
                if (name_string) {
-                       ACPI_STRCAT(name_string, char_buf);
+                       strcat(name_string, char_buf);
                        ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
                                          "Appended to - %s\n", name_string));
                } else {
index 6fac5e0a698abf8ac18d48cc8dbda22fcd5ff505..b8944ebb108145aeb817f1b6f62774da4fb1c8ac 100644 (file)
@@ -337,8 +337,8 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
                 * Copy the raw buffer data with no transform.
                 * (NULL terminated already)
                 */
-               ACPI_MEMCPY(return_desc->string.pointer,
-                           operand[0]->buffer.pointer, length);
+               memcpy(return_desc->string.pointer,
+                      operand[0]->buffer.pointer, length);
                break;
 
        case AML_CONCAT_RES_OP:
index 1c64a988cbee538634ab5eef9be21d7b7c315145..fa100b3b92ee8a4180c5ce8fe052e274ac26bce7 100644 (file)
@@ -237,8 +237,8 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
 
                        /* We have a buffer, copy the portion requested */
 
-                       ACPI_MEMCPY(buffer, operand[0]->string.pointer + index,
-                                   length);
+                       memcpy(buffer, operand[0]->string.pointer + index,
+                              length);
                }
 
                /* Set the length of the new String/Buffer */
index f6c2f5499935c7dffc1c53655b7f1f45da0a7073..b4a5e44c00dd05df639b9d56d06ee44f04dcaf1a 100644 (file)
@@ -517,15 +517,14 @@ acpi_ex_data_table_space_handler(u32 function,
        switch (function) {
        case ACPI_READ:
 
-               ACPI_MEMCPY(ACPI_CAST_PTR(char, value),
-                           ACPI_PHYSADDR_TO_PTR(address),
-                           ACPI_DIV_8(bit_width));
+               memcpy(ACPI_CAST_PTR(char, value),
+                      ACPI_PHYSADDR_TO_PTR(address), ACPI_DIV_8(bit_width));
                break;
 
        case ACPI_WRITE:
 
-               ACPI_MEMCPY(ACPI_PHYSADDR_TO_PTR(address),
-                           ACPI_CAST_PTR(char, value), ACPI_DIV_8(bit_width));
+               memcpy(ACPI_PHYSADDR_TO_PTR(address),
+                      ACPI_CAST_PTR(char, value), ACPI_DIV_8(bit_width));
                break;
 
        default:
index 6fa3c8d8fc5f9fd08e8df6f37c781134e7dab842..e1d4f4d51b97a41703546fdd71d6efb5770e3544 100644 (file)
@@ -100,9 +100,9 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
 
                /* Clear existing buffer and copy in the new one */
 
-               ACPI_MEMSET(target_desc->buffer.pointer, 0,
-                           target_desc->buffer.length);
-               ACPI_MEMCPY(target_desc->buffer.pointer, buffer, length);
+               memset(target_desc->buffer.pointer, 0,
+                      target_desc->buffer.length);
+               memcpy(target_desc->buffer.pointer, buffer, length);
 
 #ifdef ACPI_OBSOLETE_BEHAVIOR
                /*
@@ -129,8 +129,8 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
        } else {
                /* Truncate the source, copy only what will fit */
 
-               ACPI_MEMCPY(target_desc->buffer.pointer, buffer,
-                           target_desc->buffer.length);
+               memcpy(target_desc->buffer.pointer, buffer,
+                      target_desc->buffer.length);
 
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Truncating source buffer from %X to %X\n",
@@ -187,9 +187,9 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
                 * String will fit in existing non-static buffer.
                 * Clear old string and copy in the new one
                 */
-               ACPI_MEMSET(target_desc->string.pointer, 0,
-                           (acpi_size) target_desc->string.length + 1);
-               ACPI_MEMCPY(target_desc->string.pointer, buffer, length);
+               memset(target_desc->string.pointer, 0,
+                      (acpi_size) target_desc->string.length + 1);
+               memcpy(target_desc->string.pointer, buffer, length);
        } else {
                /*
                 * Free the current buffer, then allocate a new buffer
@@ -210,7 +210,7 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc,
                }
 
                target_desc->common.flags &= ~AOPOBJ_STATIC_POINTER;
-               ACPI_MEMCPY(target_desc->string.pointer, buffer, length);
+               memcpy(target_desc->string.pointer, buffer, length);
        }
 
        /* Set the new target length */
index 19ad0b5993d58583516f3f7941c45f7c46ebfeb1..c687b9979fb2a29930c822e7b9bf5f3acb359d30 100644 (file)
@@ -102,7 +102,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                /* _OSI is optional for now, will be permanent later */
 
-               if (!ACPI_STRCMP(init_val->name, "_OSI")
+               if (!strcmp(init_val->name, "_OSI")
                    && !acpi_gbl_create_osi_method) {
                        continue;
                }
@@ -180,7 +180,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                /* Build an object around the static string */
 
-                               obj_desc->string.length = (u32)ACPI_STRLEN(val);
+                               obj_desc->string.length = (u32)strlen(val);
                                obj_desc->string.pointer = val;
                                obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
                                break;
@@ -203,7 +203,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                /* Special case for ACPI Global Lock */
 
-                               if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
+                               if (strcmp(init_val->name, "_GL_") == 0) {
                                        acpi_gbl_global_lock_mutex = obj_desc;
 
                                        /* Create additional counting semaphore for global lock */
index 1a8b39c8d969d9567654c23cff984285b241f0c1..da55a1c60da180cf4f2aeec66f1dd0f41e22d974 100644 (file)
@@ -187,8 +187,8 @@ acpi_ns_convert_to_string(union acpi_operand_object *original_object,
                 * Copy the raw buffer data with no transform. String is already NULL
                 * terminated at Length+1.
                 */
-               ACPI_MEMCPY(new_object->string.pointer,
-                           original_object->buffer.pointer, length);
+               memcpy(new_object->string.pointer,
+                      original_object->buffer.pointer, length);
                break;
 
        default:
@@ -251,9 +251,9 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
                        return (AE_NO_MEMORY);
                }
 
-               ACPI_MEMCPY(new_object->buffer.pointer,
-                           original_object->string.pointer,
-                           original_object->string.length);
+               memcpy(new_object->buffer.pointer,
+                      original_object->string.pointer,
+                      original_object->string.length);
                break;
 
        case ACPI_TYPE_PACKAGE:
index d259393505fa9bb9230ef51a152a01c317c5350c..0f1daba640e7a5f70c5a6f0196398f65551219d8 100644 (file)
@@ -101,7 +101,7 @@ void acpi_ns_print_pathname(u32 num_segments, char *pathname)
 
        while (num_segments) {
                for (i = 0; i < 4; i++) {
-                       ACPI_IS_PRINT(pathname[i]) ?
+                       isprint((int)pathname[i]) ?
                            acpi_os_printf("%c", pathname[i]) :
                            acpi_os_printf("?");
                }
index 7bcc68f57afa61d24d6d170e04bb9c2db8271900..a725d88b036b343c180b66eb7fe430c4f147398c 100644 (file)
@@ -440,7 +440,7 @@ acpi_ns_exec_module_code(union acpi_operand_object *method_obj,
 
        /* Initialize the evaluation information block */
 
-       ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info));
+       memset(info, 0, sizeof(struct acpi_evaluate_info));
        info->prefix_node = parent_node;
 
        /*
index 4a85c45179883b14421f324d4fcc2b9f923f0309..b744a53618eb3977663ab75a6a31e808e96b5aeb 100644 (file)
@@ -90,7 +90,7 @@ acpi_status acpi_ns_initialize_objects(void)
 
        /* Set all init info to zero */
 
-       ACPI_MEMSET(&info, 0, sizeof(struct acpi_init_walk_info));
+       memset(&info, 0, sizeof(struct acpi_init_walk_info));
 
        /* Walk entire namespace from the supplied root */
 
@@ -566,7 +566,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname
                        (ACPI_TYPE_METHOD, device_node, METHOD_NAME__INI));
 
-       ACPI_MEMSET(info, 0, sizeof(struct acpi_evaluate_info));
+       memset(info, 0, sizeof(struct acpi_evaluate_info));
        info->prefix_node = device_node;
        info->relative_pathname = METHOD_NAME__INI;
        info->parameters = NULL;
index c30672d238789668fdfd70ea7ad512838e3e7f55..0515a70f42a4fb6f27a78466b004d34517c8b51c 100644 (file)
@@ -580,7 +580,7 @@ acpi_ns_repair_HID(struct acpi_evaluate_info *info,
         * # is a hex digit.
         */
        for (dest = new_string->string.pointer; *source; dest++, source++) {
-               *dest = (char)ACPI_TOUPPER(*source);
+               *dest = (char)toupper((int)*source);
        }
 
        acpi_ut_remove_reference(return_object);
index 6ad02008c0c23ae9cb7bbd3f4d8fa86b348f2dc6..8d8104b8bd28affdf70a35c38295116c25ec423c 100644 (file)
@@ -292,8 +292,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
                        } else {
                                /* Convert the character to uppercase and save it */
 
-                               result[i] =
-                                   (char)ACPI_TOUPPER((int)*external_name);
+                               result[i] = (char)toupper((int)*external_name);
                                external_name++;
                        }
                }
index b6030a2deee1248ab9b783bc3d30ce7ac9fbaa75..6ee1e52b903d344d31ed5b140f8385204cb5c94c 100644 (file)
@@ -696,7 +696,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                        return (AE_CTRL_DEPTH);
                }
 
-               no_match = ACPI_STRCMP(hid->string, info->hid);
+               no_match = strcmp(hid->string, info->hid);
                ACPI_FREE(hid);
 
                if (no_match) {
@@ -715,8 +715,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
 
                        found = FALSE;
                        for (i = 0; i < cid->count; i++) {
-                               if (ACPI_STRCMP(cid->ids[i].string, info->hid)
-                                   == 0) {
+                               if (strcmp(cid->ids[i].string, info->hid) == 0) {
 
                                        /* Found a matching CID */
 
index dc0836a9cf179640248dc4b2db60ef41e8227067..9ff643b9553fe9a4d97a803b4a0b0e7def2b299f 100644 (file)
@@ -114,7 +114,7 @@ acpi_get_handle(acpi_handle parent,
 
                /* Special case for root-only, since we can't search for it */
 
-               if (!ACPI_STRCMP(pathname, ACPI_NS_ROOT_PATH)) {
+               if (!strcmp(pathname, ACPI_NS_ROOT_PATH)) {
                        *ret_handle =
                            ACPI_CAST_PTR(acpi_handle, acpi_gbl_root_node);
                        return (AE_OK);
@@ -242,7 +242,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
 
        /* Copy actual string and return a pointer to the next string area */
 
-       ACPI_MEMCPY(string_area, source->string, source->length);
+       memcpy(string_area, source->string, source->length);
        return (string_area + source->length);
 }
 
@@ -637,7 +637,7 @@ acpi_status acpi_install_method(u8 *buffer)
 
        /* Copy the method AML to the local buffer */
 
-       ACPI_MEMCPY(aml_buffer, aml_start, aml_length);
+       memcpy(aml_buffer, aml_start, aml_length);
 
        /* Initialize the method object with the new method's information */
 
index 960505ab409a8b3958336058bb26837b6c9109c0..32440912023a7d4a8ab65bf84de8df7beb37d633 100644 (file)
@@ -93,10 +93,9 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
        op->common.descriptor_type = ACPI_DESC_TYPE_PARSER;
        op->common.aml_opcode = opcode;
 
-       ACPI_DISASM_ONLY_MEMBERS(ACPI_STRNCPY(op->common.aml_op_name,
-                                             (acpi_ps_get_opcode_info
-                                              (opcode))->name,
-                                             sizeof(op->common.aml_op_name)));
+       ACPI_DISASM_ONLY_MEMBERS(strncpy(op->common.aml_op_name,
+                                        (acpi_ps_get_opcode_info(opcode))->
+                                        name, sizeof(op->common.aml_op_name)));
 }
 
 /*******************************************************************************
index f30f35e6ff2a19aa4d6fc6a8e64874105d788733..3fa829e96c2a0de77e079fb8d95a3a7f25240a4f 100644 (file)
@@ -353,13 +353,13 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                                /* +1 to include null terminator */
 
                                user_prt->length +=
-                                   (u32)ACPI_STRLEN(user_prt->source) + 1;
+                                   (u32)strlen(user_prt->source) + 1;
                                break;
 
                        case ACPI_TYPE_STRING:
 
-                               ACPI_STRCPY(user_prt->source,
-                                           obj_desc->string.pointer);
+                               strcpy(user_prt->source,
+                                      obj_desc->string.pointer);
 
                                /*
                                 * Add to the Length field the length of the string
index 1fe49d22366333b2172e82d622bfe7f6289d8f0d..ac37852e082173869fef4cc872e6734451d0419f 100644 (file)
@@ -119,7 +119,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                        /*
                         * Get the resource type and the initial (minimum) length
                         */
-                       ACPI_MEMSET(resource, 0, INIT_RESOURCE_LENGTH(info));
+                       memset(resource, 0, INIT_RESOURCE_LENGTH(info));
                        resource->type = INIT_RESOURCE_TYPE(info);
                        resource->length = INIT_RESOURCE_LENGTH(info);
                        break;
@@ -324,13 +324,13 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 
                case ACPI_RSC_SET8:
 
-                       ACPI_MEMSET(destination, info->aml_offset, info->value);
+                       memset(destination, info->aml_offset, info->value);
                        break;
 
                case ACPI_RSC_DATA8:
 
                        target = ACPI_ADD_PTR(char, resource, info->value);
-                       ACPI_MEMCPY(destination, source, ACPI_GET16(target));
+                       memcpy(destination, source, ACPI_GET16(target));
                        break;
 
                case ACPI_RSC_ADDRESS:
@@ -502,7 +502,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                switch (info->opcode) {
                case ACPI_RSC_INITSET:
 
-                       ACPI_MEMSET(aml, 0, INIT_RESOURCE_LENGTH(info));
+                       memset(aml, 0, INIT_RESOURCE_LENGTH(info));
                        aml_length = INIT_RESOURCE_LENGTH(info);
                        acpi_rs_set_resource_header(INIT_RESOURCE_TYPE(info),
                                                    aml_length, aml);
index 90417de38dab6fbaa72f9596dea605918251026b..52b024df00524bffae3bb1117cffa0d3dc31eb3b 100644 (file)
@@ -148,7 +148,7 @@ acpi_rs_move_data(void *destination, void *source, u16 item_count, u8 move_type)
                case ACPI_RSC_MOVE_SERIAL_VEN:
                case ACPI_RSC_MOVE_SERIAL_RES:
 
-                       ACPI_MEMCPY(destination, source, item_count);
+                       memcpy(destination, source, item_count);
                        return;
 
                        /*
@@ -364,12 +364,11 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                 * Zero the entire area of the buffer.
                 */
                total_length =
-                   (u32)
-                   ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
+                   (u32)strlen(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
                    1;
                total_length = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
 
-               ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
+               memset(resource_source->string_ptr, 0, total_length);
 
                /* Copy the resource_source string to the destination */
 
@@ -432,8 +431,8 @@ acpi_rs_set_resource_source(union aml_resource * aml,
 
                /* Copy the resource_source string */
 
-               ACPI_STRCPY(ACPI_CAST_PTR(char, &aml_resource_source[1]),
-                           resource_source->string_ptr);
+               strcpy(ACPI_CAST_PTR(char, &aml_resource_source[1]),
+                      resource_source->string_ptr);
 
                /*
                 * Add the length of the string (+ 1 for null terminator) to the
index 8e6276df0226ef5ff5e5297afa0d5708e471c738..de51f836ef68e23280897bda0aca300b5341db90 100644 (file)
@@ -398,8 +398,8 @@ acpi_resource_to_address64(struct acpi_resource *resource,
 
                /* Simple copy for 64 bit source */
 
-               ACPI_MEMCPY(out, &resource->data,
-                           sizeof(struct acpi_resource_address64));
+               memcpy(out, &resource->data,
+                      sizeof(struct acpi_resource_address64));
                break;
 
        default:
@@ -499,7 +499,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
         */
        if ((vendor->byte_length < (ACPI_UUID_LENGTH + 1)) ||
            (vendor->uuid_subtype != info->uuid->subtype) ||
-           (ACPI_MEMCMP(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) {
+           (memcmp(vendor->uuid, info->uuid->data, ACPI_UUID_LENGTH))) {
                return (AE_OK);
        }
 
@@ -513,7 +513,7 @@ acpi_rs_match_vendor_resource(struct acpi_resource *resource, void *context)
 
        /* Found the correct resource, copy and return it */
 
-       ACPI_MEMCPY(buffer->pointer, resource, resource->length);
+       memcpy(buffer->pointer, resource, resource->length);
        buffer->length = resource->length;
 
        /* Found the desired descriptor, terminate resource walk */
index d7f8386455bdc0e2ce35a36b7f80c188d376b86f..5c9d5abf15887e4e5d42f3e8651eee0876bb1697 100644 (file)
@@ -73,7 +73,7 @@ acpi_tb_init_table_descriptor(struct acpi_table_desc *table_desc,
         * Initialize the table descriptor. Set the pointer to NULL, since the
         * table is not fully mapped at this time.
         */
-       ACPI_MEMSET(table_desc, 0, sizeof(struct acpi_table_desc));
+       memset(table_desc, 0, sizeof(struct acpi_table_desc));
        table_desc->address = address;
        table_desc->length = table->length;
        table_desc->flags = flags;
@@ -465,9 +465,9 @@ acpi_status acpi_tb_resize_root_table_list(void)
        /* Copy and free the previous table array */
 
        if (acpi_gbl_root_table_list.tables) {
-               ACPI_MEMCPY(tables, acpi_gbl_root_table_list.tables,
-                           (acpi_size) table_count *
-                           sizeof(struct acpi_table_desc));
+               memcpy(tables, acpi_gbl_root_table_list.tables,
+                      (acpi_size) table_count *
+                      sizeof(struct acpi_table_desc));
 
                if (acpi_gbl_root_table_list.flags & ACPI_ROOT_ORIGIN_ALLOCATED) {
                        ACPI_FREE(acpi_gbl_root_table_list.tables);
index 05be59c772c750b21c68975ced0ea88358a228ff..6253001b6375d16629b7066f23377460ecbf0fce 100644 (file)
@@ -398,12 +398,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
 
        /* Clear the entire local FADT */
 
-       ACPI_MEMSET(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
+       memset(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
 
        /* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */
 
-       ACPI_MEMCPY(&acpi_gbl_FADT, table,
-                   ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
+       memcpy(&acpi_gbl_FADT, table,
+              ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
 
        /* Take a copy of the Hardware Reduced flag */
 
index 0b879fcfef670c535f30ac57cb403ff87dcbf266..119c84ad98334e2404fb72e585c4ec30ee49c684 100644 (file)
@@ -76,16 +76,16 @@ acpi_tb_find_table(char *signature,
 
        /* Normalize the input strings */
 
-       ACPI_MEMSET(&header, 0, sizeof(struct acpi_table_header));
+       memset(&header, 0, sizeof(struct acpi_table_header));
        ACPI_MOVE_NAME(header.signature, signature);
-       ACPI_STRNCPY(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
-       ACPI_STRNCPY(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
+       strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
+       strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
 
        /* Search for the table */
 
        for (i = 0; i < acpi_gbl_root_table_list.current_table_count; ++i) {
-               if (ACPI_MEMCMP(&(acpi_gbl_root_table_list.tables[i].signature),
-                               header.signature, ACPI_NAME_SIZE)) {
+               if (memcmp(&(acpi_gbl_root_table_list.tables[i].signature),
+                          header.signature, ACPI_NAME_SIZE)) {
 
                        /* Not the requested table */
 
@@ -112,21 +112,20 @@ acpi_tb_find_table(char *signature,
 
                /* Check for table match on all IDs */
 
-               if (!ACPI_MEMCMP
+               if (!memcmp
                    (acpi_gbl_root_table_list.tables[i].pointer->signature,
                     header.signature, ACPI_NAME_SIZE) && (!oem_id[0]
                                                           ||
-                                                          !ACPI_MEMCMP
+                                                          !memcmp
                                                           (acpi_gbl_root_table_list.
                                                            tables[i].pointer->
                                                            oem_id,
                                                            header.oem_id,
                                                            ACPI_OEM_ID_SIZE))
                    && (!oem_table_id[0]
-                       || !ACPI_MEMCMP(acpi_gbl_root_table_list.tables[i].
-                                       pointer->oem_table_id,
-                                       header.oem_table_id,
-                                       ACPI_OEM_TABLE_ID_SIZE))) {
+                       || !memcmp(acpi_gbl_root_table_list.tables[i].pointer->
+                                  oem_table_id, header.oem_table_id,
+                                  ACPI_OEM_TABLE_ID_SIZE))) {
                        *table_index = i;
 
                        ACPI_DEBUG_PRINT((ACPI_DB_TABLES,
index 008a251780f4c955194c7193dd943bf955028b34..15ea98e0068d80971834a5d15bd5c7ef30356f41 100644 (file)
@@ -87,8 +87,8 @@ acpi_tb_compare_tables(struct acpi_table_desc *table_desc, u32 table_index)
         * not just the header.
         */
        is_identical = (u8)((table_desc->length != table_length ||
-                            ACPI_MEMCMP(table_desc->pointer, table,
-                                        table_length)) ? FALSE : TRUE);
+                            memcmp(table_desc->pointer, table, table_length)) ?
+                           FALSE : TRUE);
 
        /* Release the acquired table */
 
@@ -289,8 +289,7 @@ acpi_tb_install_standard_table(acpi_physical_address address,
                if ((new_table_desc.signature.ascii[0] != 0x00) &&
                    (!ACPI_COMPARE_NAME
                     (&new_table_desc.signature, ACPI_SIG_SSDT))
-                   && (ACPI_STRNCMP(new_table_desc.signature.ascii, "OEM", 3)))
-               {
+                   && (strncmp(new_table_desc.signature.ascii, "OEM", 3))) {
                        ACPI_BIOS_ERROR((AE_INFO,
                                         "Table has invalid signature [%4.4s] (0x%8.8X), "
                                         "must be SSDT or OEMx",
index 77ba5c71c6e787e88a7f7923e44e1bc3adfeb7ca..709d5112fc1679db4a6ff28412a27bbe5c334d81 100644 (file)
@@ -73,7 +73,7 @@ static void acpi_tb_fix_string(char *string, acpi_size length)
 {
 
        while (length && *string) {
-               if (!ACPI_IS_PRINT(*string)) {
+               if (!isprint((int)*string)) {
                        *string = '?';
                }
                string++;
@@ -100,7 +100,7 @@ acpi_tb_cleanup_table_header(struct acpi_table_header *out_header,
                             struct acpi_table_header *header)
 {
 
-       ACPI_MEMCPY(out_header, header, sizeof(struct acpi_table_header));
+       memcpy(out_header, header, sizeof(struct acpi_table_header));
 
        acpi_tb_fix_string(out_header->signature, ACPI_NAME_SIZE);
        acpi_tb_fix_string(out_header->oem_id, ACPI_OEM_ID_SIZE);
@@ -138,9 +138,9 @@ acpi_tb_print_table_header(acpi_physical_address address,
 
                /* RSDP has no common fields */
 
-               ACPI_MEMCPY(local_header.oem_id,
-                           ACPI_CAST_PTR(struct acpi_table_rsdp,
-                                         header)->oem_id, ACPI_OEM_ID_SIZE);
+               memcpy(local_header.oem_id,
+                      ACPI_CAST_PTR(struct acpi_table_rsdp, header)->oem_id,
+                      ACPI_OEM_ID_SIZE);
                acpi_tb_fix_string(local_header.oem_id, ACPI_OEM_ID_SIZE);
 
                ACPI_INFO((AE_INFO, "RSDP 0x%8.8X%8.8X %06X (v%.2d %-6.6s)",
index 2bb6a117c840d4f48fe1e4f6a0e3592644dbd5cb..568ac0e4a3c6a784efe38349213c26146888f6d5 100644 (file)
@@ -188,7 +188,7 @@ struct acpi_table_header *acpi_tb_copy_dsdt(u32 table_index)
                return (NULL);
        }
 
-       ACPI_MEMCPY(new_table, table_desc->pointer, table_desc->length);
+       memcpy(new_table, table_desc->pointer, table_desc->length);
        acpi_tb_uninstall_table(table_desc);
 
        acpi_tb_init_table_descriptor(&acpi_gbl_root_table_list.
index 54b9f7957ff1ca93565d49d6df1f9d84084379a5..5559e2c70b15634384fa907b1934d1df4c97bdf3 100644 (file)
@@ -119,9 +119,9 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
        } else {
                /* Root Table Array has been statically allocated by the host */
 
-               ACPI_MEMSET(initial_table_array, 0,
-                           (acpi_size) initial_table_count *
-                           sizeof(struct acpi_table_desc));
+               memset(initial_table_array, 0,
+                      (acpi_size) initial_table_count *
+                      sizeof(struct acpi_table_desc));
 
                acpi_gbl_root_table_list.tables = initial_table_array;
                acpi_gbl_root_table_list.max_table_count = initial_table_count;
@@ -243,8 +243,8 @@ acpi_get_table_header(char *signature,
                                        return (AE_NO_MEMORY);
                                }
 
-                               ACPI_MEMCPY(out_table_header, header,
-                                           sizeof(struct acpi_table_header));
+                               memcpy(out_table_header, header,
+                                      sizeof(struct acpi_table_header));
                                acpi_os_unmap_memory(header,
                                                     sizeof(struct
                                                            acpi_table_header));
@@ -252,9 +252,9 @@ acpi_get_table_header(char *signature,
                                return (AE_NOT_FOUND);
                        }
                } else {
-                       ACPI_MEMCPY(out_table_header,
-                                   acpi_gbl_root_table_list.tables[i].pointer,
-                                   sizeof(struct acpi_table_header));
+                       memcpy(out_table_header,
+                              acpi_gbl_root_table_list.tables[i].pointer,
+                              sizeof(struct acpi_table_header));
                }
                return (AE_OK);
        }
index cf56e18cdc6456e5ff07d96dd1374217f6241346..9682d40ca6ffe70f8c50078fc4f89172b7b37702 100644 (file)
@@ -150,8 +150,8 @@ static acpi_status acpi_tb_load_namespace(void)
         * Save the original DSDT header for detection of table corruption
         * and/or replacement of the DSDT from outside the OS.
         */
-       ACPI_MEMCPY(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
-                   sizeof(struct acpi_table_header));
+       memcpy(&acpi_gbl_original_dsdt_header, acpi_gbl_DSDT,
+              sizeof(struct acpi_table_header));
 
        (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
 
index 61d8f6d186d11c15c0f6f6c9489cf2b6d7fdae32..7a4101f0685e90d748fc8910255abf2df517331c 100644 (file)
@@ -73,7 +73,7 @@ void *acpi_os_allocate_zeroed(acpi_size size)
 
                /* Clear the memory block */
 
-               ACPI_MEMSET(allocation, 0, size);
+               memset(allocation, 0, size);
        }
 
        return (allocation);
@@ -181,7 +181,7 @@ acpi_status acpi_ut_delete_caches(void)
        char buffer[7];
 
        if (acpi_gbl_display_final_mem_stats) {
-               ACPI_STRCPY(buffer, "MEMORY");
+               strcpy(buffer, "MEMORY");
                (void)acpi_db_display_statistics(buffer);
        }
 #endif
@@ -337,6 +337,6 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 
        /* Have a valid buffer, clear it */
 
-       ACPI_MEMSET(buffer->pointer, 0, required_length);
+       memset(buffer->pointer, 0, required_length);
        return (AE_OK);
 }
index a8c39643e6181fbebff0aa047b1391551720082a..01c8709ca58694a17c4e766fd852a14898ac19d8 100644 (file)
@@ -159,7 +159,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
                        }
 
                        buf_char = buffer[(acpi_size) i + j];
-                       if (ACPI_IS_PRINT(buf_char)) {
+                       if (isprint(buf_char)) {
                                acpi_os_printf("%c", buf_char);
                        } else {
                                acpi_os_printf(".");
@@ -319,7 +319,7 @@ acpi_ut_dump_buffer_to_file(ACPI_FILE file,
                        }
 
                        buf_char = buffer[(acpi_size) i + j];
-                       if (ACPI_IS_PRINT(buf_char)) {
+                       if (isprint(buf_char)) {
                                acpi_ut_file_printf(file, "%c", buf_char);
                        } else {
                                acpi_ut_file_printf(file, ".");
index eacc5eee362ebd9e7c5290ff6054ee5009ca633f..0d21fbd993633f774d78ca93f7bef2a33f2ff72f 100644 (file)
@@ -84,7 +84,7 @@ acpi_os_create_cache(char *cache_name,
 
        /* Populate the cache object and return it */
 
-       ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
+       memset(cache, 0, sizeof(struct acpi_memory_list));
        cache->list_name = cache_name;
        cache->object_size = object_size;
        cache->max_depth = max_depth;
@@ -212,7 +212,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)
 
                /* Mark the object as cached */
 
-               ACPI_MEMSET(object, 0xCA, cache->object_size);
+               memset(object, 0xCA, cache->object_size);
                ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED);
 
                /* Put the object at the head of the cache list */
@@ -281,7 +281,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
                /* Clear (zero) the previously used Object */
 
-               ACPI_MEMSET(object, 0, cache->object_size);
+               memset(object, 0, cache->object_size);
        } else {
                /* The cache is empty, create a new object */
 
index c37ec5035f4c5f48e207cbd5082db3f55780550d..257221d452c8839262faf80465969b0ec75d8a54 100644 (file)
@@ -129,7 +129,7 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
 
        /* Always clear the external object */
 
-       ACPI_MEMSET(external_object, 0, sizeof(union acpi_object));
+       memset(external_object, 0, sizeof(union acpi_object));
 
        /*
         * In general, the external object will be the same type as
@@ -149,9 +149,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
                                                                  string.
                                                                  length + 1);
 
-               ACPI_MEMCPY((void *)data_space,
-                           (void *)internal_object->string.pointer,
-                           (acpi_size) internal_object->string.length + 1);
+               memcpy((void *)data_space,
+                      (void *)internal_object->string.pointer,
+                      (acpi_size) internal_object->string.length + 1);
                break;
 
        case ACPI_TYPE_BUFFER:
@@ -162,9 +162,9 @@ acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
                    ACPI_ROUND_UP_TO_NATIVE_WORD(internal_object->string.
                                                 length);
 
-               ACPI_MEMCPY((void *)data_space,
-                           (void *)internal_object->buffer.pointer,
-                           internal_object->buffer.length);
+               memcpy((void *)data_space,
+                      (void *)internal_object->buffer.pointer,
+                      internal_object->buffer.length);
                break;
 
        case ACPI_TYPE_INTEGER:
@@ -502,9 +502,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                        goto error_exit;
                }
 
-               ACPI_MEMCPY(internal_object->string.pointer,
-                           external_object->string.pointer,
-                           external_object->string.length);
+               memcpy(internal_object->string.pointer,
+                      external_object->string.pointer,
+                      external_object->string.length);
 
                internal_object->string.length = external_object->string.length;
                break;
@@ -517,9 +517,9 @@ acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
                        goto error_exit;
                }
 
-               ACPI_MEMCPY(internal_object->buffer.pointer,
-                           external_object->buffer.pointer,
-                           external_object->buffer.length);
+               memcpy(internal_object->buffer.pointer,
+                      external_object->buffer.pointer,
+                      external_object->buffer.length);
 
                internal_object->buffer.length = external_object->buffer.length;
 
@@ -694,8 +694,8 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                copy_size = sizeof(struct acpi_namespace_node);
        }
 
-       ACPI_MEMCPY(ACPI_CAST_PTR(char, dest_desc),
-                   ACPI_CAST_PTR(char, source_desc), copy_size);
+       memcpy(ACPI_CAST_PTR(char, dest_desc),
+              ACPI_CAST_PTR(char, source_desc), copy_size);
 
        /* Restore the saved fields */
 
@@ -725,9 +725,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
 
                        /* Copy the actual buffer data */
 
-                       ACPI_MEMCPY(dest_desc->buffer.pointer,
-                                   source_desc->buffer.pointer,
-                                   source_desc->buffer.length);
+                       memcpy(dest_desc->buffer.pointer,
+                              source_desc->buffer.pointer,
+                              source_desc->buffer.length);
                }
                break;
 
@@ -747,9 +747,9 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
 
                        /* Copy the actual string data */
 
-                       ACPI_MEMCPY(dest_desc->string.pointer,
-                                   source_desc->string.pointer,
-                                   (acpi_size) source_desc->string.length + 1);
+                       memcpy(dest_desc->string.pointer,
+                              source_desc->string.pointer,
+                              (acpi_size) source_desc->string.length + 1);
                }
                break;
 
index 3afe07f19b9f2d7d300b534ff76ece9817e7febf..7956df1e263c1cb1271614cdba965d1592d9a18a 100644 (file)
@@ -111,7 +111,7 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
        if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
                acpi_ex_eisa_id_to_string(hid->string, obj_desc->integer.value);
        } else {
-               ACPI_STRCPY(hid->string, obj_desc->string.pointer);
+               strcpy(hid->string, obj_desc->string.pointer);
        }
 
        hid->length = length;
@@ -180,7 +180,7 @@ acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
 
        /* Simply copy existing string */
 
-       ACPI_STRCPY(sub->string, obj_desc->string.pointer);
+       strcpy(sub->string, obj_desc->string.pointer);
        sub->length = length;
        *return_id = sub;
 
@@ -256,7 +256,7 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
        if (obj_desc->common.type == ACPI_TYPE_INTEGER) {
                acpi_ex_integer_to_string(uid->string, obj_desc->integer.value);
        } else {
-               ACPI_STRCPY(uid->string, obj_desc->string.pointer);
+               strcpy(uid->string, obj_desc->string.pointer);
        }
 
        uid->length = length;
@@ -393,8 +393,7 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
 
                        /* Copy the String CID from the returned object */
 
-                       ACPI_STRCPY(next_id_string,
-                                   cid_objects[i]->string.pointer);
+                       strcpy(next_id_string, cid_objects[i]->string.pointer);
                        length = cid_objects[i]->string.length + 1;
                }
 
index 28099e23000824c92f13f02b57d6aa2094e45baf..71b66537f8260daf7e09ceae9747790bcf71bd8c 100644 (file)
@@ -66,9 +66,9 @@ u8 acpi_ut_is_pci_root_bridge(char *id)
         * Check if this is a PCI root bridge.
         * ACPI 3.0+: check for a PCI Express root also.
         */
-       if (!(ACPI_STRCMP(id,
-                         PCI_ROOT_HID_STRING)) ||
-           !(ACPI_STRCMP(id, PCI_EXPRESS_ROOT_HID_STRING))) {
+       if (!(strcmp(id,
+                    PCI_ROOT_HID_STRING)) ||
+           !(strcmp(id, PCI_EXPRESS_ROOT_HID_STRING))) {
                return (TRUE);
        }
 
index 44035abdbf2948000ae2ffd3861d07ff08746b6e..8f3d203aed79844ee78859ae954492f09e9fce95 100644 (file)
@@ -232,8 +232,7 @@ acpi_status acpi_ut_install_interface(acpi_string interface_name)
                return (AE_NO_MEMORY);
        }
 
-       interface_info->name =
-           ACPI_ALLOCATE_ZEROED(ACPI_STRLEN(interface_name) + 1);
+       interface_info->name = ACPI_ALLOCATE_ZEROED(strlen(interface_name) + 1);
        if (!interface_info->name) {
                ACPI_FREE(interface_info);
                return (AE_NO_MEMORY);
@@ -241,7 +240,7 @@ acpi_status acpi_ut_install_interface(acpi_string interface_name)
 
        /* Initialize new info and insert at the head of the global list */
 
-       ACPI_STRCPY(interface_info->name, interface_name);
+       strcpy(interface_info->name, interface_name);
        interface_info->flags = ACPI_OSI_DYNAMIC;
        interface_info->next = acpi_gbl_supported_interfaces;
 
@@ -269,7 +268,7 @@ acpi_status acpi_ut_remove_interface(acpi_string interface_name)
 
        previous_interface = next_interface = acpi_gbl_supported_interfaces;
        while (next_interface) {
-               if (!ACPI_STRCMP(interface_name, next_interface->name)) {
+               if (!strcmp(interface_name, next_interface->name)) {
 
                        /* Found: name is in either the static list or was added at runtime */
 
@@ -373,7 +372,7 @@ struct acpi_interface_info *acpi_ut_get_interface(acpi_string interface_name)
 
        next_interface = acpi_gbl_supported_interfaces;
        while (next_interface) {
-               if (!ACPI_STRCMP(interface_name, next_interface->name)) {
+               if (!strcmp(interface_name, next_interface->name)) {
                        return (next_interface);
                }
 
index 29e449935a82e5f802a96f8e3c09d257a2bb2529..97898ed71b4b3a9a9a9e8d510b83fdbe52546a71 100644 (file)
@@ -148,7 +148,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
        u32 j;
 
        if (!expected_btypes) {
-               ACPI_STRCPY(buffer, "NONE");
+               strcpy(buffer, "NONE");
                return;
        }
 
@@ -161,7 +161,7 @@ void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
                /* If one of the expected types, concatenate the name of this type */
 
                if (expected_btypes & this_rtype) {
-                       ACPI_STRCAT(buffer, &ut_rtype_names[i][j]);
+                       strcat(buffer, &ut_rtype_names[i][j]);
                        j = 0;  /* Use name separator from now on */
                }
 
index 2be6bd4bdc09d7662c15a9ee3ab733310be3d077..b26297c5de49d528f19e8d0aacba119f94c69a71 100644 (file)
@@ -180,7 +180,7 @@ const char *acpi_ut_scan_number(const char *string, u64 *number_ptr)
 {
        u64 number = 0;
 
-       while (ACPI_IS_DIGIT(*string)) {
+       while (isdigit((int)*string)) {
                number *= 10;
                number += *(string++) - '0';
        }
@@ -405,7 +405,7 @@ acpi_ut_vsnprintf(char *string,
                /* Process width */
 
                width = -1;
-               if (ACPI_IS_DIGIT(*format)) {
+               if (isdigit((int)*format)) {
                        format = acpi_ut_scan_number(format, &number);
                        width = (s32) number;
                } else if (*format == '*') {
@@ -422,7 +422,7 @@ acpi_ut_vsnprintf(char *string,
                precision = -1;
                if (*format == '.') {
                        ++format;
-                       if (ACPI_IS_DIGIT(*format)) {
+                       if (isdigit((int)*format)) {
                                format = acpi_ut_scan_number(format, &number);
                                precision = (s32) number;
                        } else if (*format == '*') {
index 83b6c52490dc06097d945fb0245189543adb3835..8f3c883dfe0ec305aa167bf0db0970d7cc60cf82 100644 (file)
@@ -79,7 +79,7 @@ void acpi_ut_strlwr(char *src_string)
        /* Walk entire string, lowercasing the letters */
 
        for (string = src_string; *string; string++) {
-               *string = (char)ACPI_TOLOWER(*string);
+               *string = (char)tolower((int)*string);
        }
 
        return;
@@ -145,7 +145,7 @@ void acpi_ut_strupr(char *src_string)
        /* Walk entire string, uppercasing the letters */
 
        for (string = src_string; *string; string++) {
-               *string = (char)ACPI_TOUPPER(*string);
+               *string = (char)toupper((int)*string);
        }
 
        return;
@@ -202,7 +202,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
        /* Skip over any white space in the buffer */
 
-       while ((*string) && (ACPI_IS_SPACE(*string) || *string == '\t')) {
+       while ((*string) && (isspace((int)*string) || *string == '\t')) {
                string++;
        }
 
@@ -211,7 +211,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
                 * Base equal to ACPI_ANY_BASE means 'ToInteger operation case'.
                 * We need to determine if it is decimal or hexadecimal.
                 */
-               if ((*string == '0') && (ACPI_TOLOWER(*(string + 1)) == 'x')) {
+               if ((*string == '0') && (tolower((int)*(string + 1)) == 'x')) {
                        sign_of0x = 1;
                        base = 16;
 
@@ -224,7 +224,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
        /* Any string left? Check that '0x' is not followed by white space. */
 
-       if (!(*string) || ACPI_IS_SPACE(*string) || *string == '\t') {
+       if (!(*string) || isspace((int)*string) || *string == '\t') {
                if (to_integer_op) {
                        goto error_exit;
                } else {
@@ -241,7 +241,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
        /* Main loop: convert the string to a 32- or 64-bit integer */
 
        while (*string) {
-               if (ACPI_IS_DIGIT(*string)) {
+               if (isdigit((int)*string)) {
 
                        /* Convert ASCII 0-9 to Decimal value */
 
@@ -252,8 +252,8 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 
                        term = 1;
                } else {
-                       this_digit = (u8)ACPI_TOUPPER(*string);
-                       if (ACPI_IS_XDIGIT((char)this_digit)) {
+                       this_digit = (u8)toupper((int)*string);
+                       if (isxdigit((int)this_digit)) {
 
                                /* Convert ASCII Hex char to value */
 
@@ -404,7 +404,7 @@ void acpi_ut_print_string(char *string, u16 max_length)
 
                        /* Check for printable character or hex escape */
 
-                       if (ACPI_IS_PRINT(string[i])) {
+                       if (isprint((int)string[i])) {
                                /* This is a normal character */
 
                                acpi_os_printf("%c", (int)string[i]);
@@ -609,22 +609,22 @@ void ut_convert_backslashes(char *pathname)
 u8 acpi_ut_safe_strcpy(char *dest, acpi_size dest_size, char *source)
 {
 
-       if (ACPI_STRLEN(source) >= dest_size) {
+       if (strlen(source) >= dest_size) {
                return (TRUE);
        }
 
-       ACPI_STRCPY(dest, source);
+       strcpy(dest, source);
        return (FALSE);
 }
 
 u8 acpi_ut_safe_strcat(char *dest, acpi_size dest_size, char *source)
 {
 
-       if ((ACPI_STRLEN(dest) + ACPI_STRLEN(source)) >= dest_size) {
+       if ((strlen(dest) + strlen(source)) >= dest_size) {
                return (TRUE);
        }
 
-       ACPI_STRCAT(dest, source);
+       strcat(dest, source);
        return (FALSE);
 }
 
@@ -635,14 +635,13 @@ acpi_ut_safe_strncat(char *dest,
 {
        acpi_size actual_transfer_length;
 
-       actual_transfer_length =
-           ACPI_MIN(max_transfer_length, ACPI_STRLEN(source));
+       actual_transfer_length = ACPI_MIN(max_transfer_length, strlen(source));
 
-       if ((ACPI_STRLEN(dest) + actual_transfer_length) >= dest_size) {
+       if ((strlen(dest) + actual_transfer_length) >= dest_size) {
                return (TRUE);
        }
 
-       ACPI_STRNCAT(dest, source, max_transfer_length);
+       strncat(dest, source, max_transfer_length);
        return (FALSE);
 }
 #endif
index 130dd9f96f0fe72ee03f79f6fa3631d70e608086..9a7dc8196a5da76779f10c855d17fc0e5f4430c8 100644 (file)
@@ -100,7 +100,7 @@ acpi_ut_create_list(char *list_name,
                return (AE_NO_MEMORY);
        }
 
-       ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
+       memset(cache, 0, sizeof(struct acpi_memory_list));
 
        cache->list_name = list_name;
        cache->object_size = object_size;
@@ -402,7 +402,7 @@ acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
        allocation->component = component;
        allocation->line = line;
 
-       ACPI_STRNCPY(allocation->module, module, ACPI_MAX_MODULE_NAME);
+       strncpy(allocation->module, module, ACPI_MAX_MODULE_NAME);
        allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
 
        if (!element) {
@@ -497,7 +497,7 @@ acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
 
        /* Mark the segment as deleted */
 
-       ACPI_MEMSET(&allocation->user_space, 0xEA, allocation->size);
+       memset(&allocation->user_space, 0xEA, allocation->size);
 
        status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
        return (status);
@@ -595,7 +595,7 @@ void acpi_ut_dump_allocations(u32 component, const char *module)
        while (element) {
                if ((element->component & component) &&
                    ((module == NULL)
-                    || (0 == ACPI_STRCMP(module, element->module)))) {
+                    || (0 == strcmp(module, element->module)))) {
                        descriptor =
                            ACPI_CAST_PTR(union acpi_descriptor,
                                          &element->user_space);
index 0929187bdce09c74f07e8d1a68f48eed4f2880e6..51cf52d52243c99233728a2d00d73e6171b38a28 100644 (file)
@@ -234,8 +234,8 @@ acpi_status acpi_get_statistics(struct acpi_statistics *stats)
        stats->sci_count = acpi_sci_count;
        stats->gpe_count = acpi_gpe_count;
 
-       ACPI_MEMCPY(stats->fixed_event_count, acpi_fixed_event_count,
-                   sizeof(acpi_fixed_event_count));
+       memcpy(stats->fixed_event_count, acpi_fixed_event_count,
+              sizeof(acpi_fixed_event_count));
 
        /* Other counters */
 
@@ -322,7 +322,7 @@ acpi_status acpi_install_interface(acpi_string interface_name)
 
        /* Parameter validation */
 
-       if (!interface_name || (ACPI_STRLEN(interface_name) == 0)) {
+       if (!interface_name || (strlen(interface_name) == 0)) {
                return (AE_BAD_PARAMETER);
        }
 
@@ -374,7 +374,7 @@ acpi_status acpi_remove_interface(acpi_string interface_name)
 
        /* Parameter validation */
 
-       if (!interface_name || (ACPI_STRLEN(interface_name) == 0)) {
+       if (!interface_name || (strlen(interface_name) == 0)) {
                return (AE_BAD_PARAMETER);
        }
 
index d791b986002a5edcf9b6777c60ced22aaf8eb999..c2a41d223162a3ef3936d40c111e89fd5a4c6600 100644 (file)
@@ -542,14 +542,14 @@ typedef u64 acpi_integer;
 #define ACPI_COMPARE_NAME(a,b)          (*ACPI_CAST_PTR (u32, (a)) == *ACPI_CAST_PTR (u32, (b)))
 #define ACPI_MOVE_NAME(dest,src)        (*ACPI_CAST_PTR (u32, (dest)) = *ACPI_CAST_PTR (u32, (src)))
 #else
-#define ACPI_COMPARE_NAME(a,b)          (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
-#define ACPI_MOVE_NAME(dest,src)        (ACPI_STRNCPY (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
+#define ACPI_COMPARE_NAME(a,b)          (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
+#define ACPI_MOVE_NAME(dest,src)        (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
 #endif
 
 /* Support for the special RSDP signature (8 characters) */
 
-#define ACPI_VALIDATE_RSDP_SIG(a)       (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8))
-#define ACPI_MAKE_RSDP_SIG(dest)        (ACPI_MEMCPY (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))
+#define ACPI_VALIDATE_RSDP_SIG(a)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_SIG_RSDP, 8))
+#define ACPI_MAKE_RSDP_SIG(dest)        (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_SIG_RSDP, 8))
 
 /*******************************************************************************
  *
index 1e84e62b448dee3bcbfb925ab9435353a20ea2cf..3cedd43943f42a8465772def8b68f3f93f322676 100644 (file)
 
 /* We will be linking to the standard Clib functions */
 
-#define ACPI_STRSTR(s1,s2)      strstr((s1), (s2))
-#define ACPI_STRCHR(s1,c)       strchr((s1), (c))
-#define ACPI_STRLEN(s)          (acpi_size) strlen((s))
-#define ACPI_STRCPY(d,s)        (void) strcpy((d), (s))
-#define ACPI_STRNCPY(d,s,n)     (void) strncpy((d), (s), (acpi_size)(n))
-#define ACPI_STRNCMP(d,s,n)     strncmp((d), (s), (acpi_size)(n))
-#define ACPI_STRCMP(d,s)        strcmp((d), (s))
-#define ACPI_STRCAT(d,s)        (void) strcat((d), (s))
-#define ACPI_STRNCAT(d,s,n)     strncat((d), (s), (acpi_size)(n))
-#define ACPI_STRTOUL(d,s,n)     strtoul((d), (s), (acpi_size)(n))
-#define ACPI_MEMCMP(s1,s2,n)    memcmp((const char *)(s1), (const char *)(s2), (acpi_size)(n))
-#define ACPI_MEMCPY(d,s,n)      (void) memcpy((d), (s), (acpi_size)(n))
-#define ACPI_MEMSET(d,s,n)      (void) memset((d), (s), (acpi_size)(n))
-#define ACPI_TOUPPER(i)         toupper((int) (i))
-#define ACPI_TOLOWER(i)         tolower((int) (i))
-#define ACPI_IS_XDIGIT(i)       isxdigit((int) (i))
-#define ACPI_IS_DIGIT(i)        isdigit((int) (i))
-#define ACPI_IS_SPACE(i)        isspace((int) (i))
-#define ACPI_IS_UPPER(i)        isupper((int) (i))
-#define ACPI_IS_PRINT(i)        isprint((int) (i))
-#define ACPI_IS_ALPHA(i)        isalpha((int) (i))
-
 #else
 
 /******************************************************************************
@@ -405,22 +383,6 @@ typedef char *va_list;
 
 /* Use the local (ACPICA) definitions of the clib functions */
 
-#define ACPI_STRSTR(s1,s2)      acpi_ut_strstr ((s1), (s2))
-#define ACPI_STRCHR(s1,c)       acpi_ut_strchr ((s1), (c))
-#define ACPI_STRLEN(s)          (acpi_size) acpi_ut_strlen ((s))
-#define ACPI_STRCPY(d,s)        (void) acpi_ut_strcpy ((d), (s))
-#define ACPI_STRNCPY(d,s,n)     (void) acpi_ut_strncpy ((d), (s), (acpi_size)(n))
-#define ACPI_STRNCMP(d,s,n)     acpi_ut_strncmp ((d), (s), (acpi_size)(n))
-#define ACPI_STRCMP(d,s)        acpi_ut_strcmp ((d), (s))
-#define ACPI_STRCAT(d,s)        (void) acpi_ut_strcat ((d), (s))
-#define ACPI_STRNCAT(d,s,n)     acpi_ut_strncat ((d), (s), (acpi_size)(n))
-#define ACPI_STRTOUL(d,s,n)     acpi_ut_strtoul ((d), (s), (acpi_size)(n))
-#define ACPI_MEMCMP(s1,s2,n)    acpi_ut_memcmp((const char *)(s1), (const char *)(s2), (acpi_size)(n))
-#define ACPI_MEMCPY(d,s,n)      (void) acpi_ut_memcpy ((d), (s), (acpi_size)(n))
-#define ACPI_MEMSET(d,v,n)      (void) acpi_ut_memset ((d), (v), (acpi_size)(n))
-#define ACPI_TOUPPER(c)         acpi_ut_to_upper ((int) (c))
-#define ACPI_TOLOWER(c)         acpi_ut_to_lower ((int) (c))
-
 #endif                         /* ACPI_USE_SYSTEM_CLIBRARY */
 
 #ifndef ACPI_FILE
index 5da129e10aa2dcd049647d10d025c26e08b7cf65..326e826a5d20ac5ee3829aea1aca23dfc964c2ce 100644 (file)
@@ -127,7 +127,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
                    argv[acpi_gbl_optind][0] != '-' ||
                    argv[acpi_gbl_optind][1] == '\0') {
                        return (ACPI_OPT_END);
-               } else if (ACPI_STRCMP(argv[acpi_gbl_optind], "--") == 0) {
+               } else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
                        acpi_gbl_optind++;
                        return (ACPI_OPT_END);
                }
@@ -140,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
        /* Make sure that the option is legal */
 
        if (current_char == ':' ||
-           (opts_ptr = ACPI_STRCHR(opts, current_char)) == NULL) {
+           (opts_ptr = strchr(opts, current_char)) == NULL) {
                ACPI_OPTION_ERROR("Illegal option: -", current_char);
 
                if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
index 3aff9a2c70888ea8d7894fce14fbf50642fc0577..dd5008b0617a033c76b0fda581aa4fb6a74e5788 100644 (file)
@@ -222,7 +222,7 @@ acpi_os_get_table_by_address(acpi_physical_address address,
                goto exit;
        }
 
-       ACPI_MEMCPY(local_table, mapped_table, table_length);
+       memcpy(local_table, mapped_table, table_length);
 
 exit:
        osl_unmap_table(mapped_table);
@@ -531,7 +531,7 @@ static acpi_status osl_load_rsdp(void)
        gbl_rsdp_address =
            rsdp_base + (ACPI_CAST8(mapped_table) - rsdp_address);
 
-       ACPI_MEMCPY(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
+       memcpy(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
        acpi_os_unmap_memory(rsdp_address, rsdp_size);
 
        return (AE_OK);
@@ -964,7 +964,7 @@ osl_get_bios_table(char *signature,
                goto exit;
        }
 
-       ACPI_MEMCPY(local_table, mapped_table, table_length);
+       memcpy(local_table, mapped_table, table_length);
        *address = table_address;
        *table = local_table;
 
index c736adf5fb55241ecb564a796496b2fad32e3b67..61d0de804b709d9568c1870565876f9c7fa0d5c0 100644 (file)
@@ -329,7 +329,7 @@ int ap_dump_table_by_name(char *signature)
        acpi_status status;
        int table_status;
 
-       if (ACPI_STRLEN(signature) != ACPI_NAME_SIZE) {
+       if (strlen(signature) != ACPI_NAME_SIZE) {
                acpi_log_error
                    ("Invalid table signature [%s]: must be exactly 4 characters\n",
                     signature);
@@ -338,15 +338,15 @@ int ap_dump_table_by_name(char *signature)
 
        /* Table signatures are expected to be uppercase */
 
-       ACPI_STRCPY(local_signature, signature);
+       strcpy(local_signature, signature);
        acpi_ut_strupr(local_signature);
 
        /* To be friendly, handle tables whose signatures do not match the name */
 
        if (ACPI_COMPARE_NAME(local_signature, "FADT")) {
-               ACPI_STRCPY(local_signature, ACPI_SIG_FADT);
+               strcpy(local_signature, ACPI_SIG_FADT);
        } else if (ACPI_COMPARE_NAME(local_signature, "MADT")) {
-               ACPI_STRCPY(local_signature, ACPI_SIG_MADT);
+               strcpy(local_signature, ACPI_SIG_MADT);
        }
 
        /* Dump all instances of this signature (to handle multiple SSDTs) */
index 8f2fe168228eb12d9e97efa085d9d5d5d41d94f3..a37f9702b2a90433978f4a6715919c4a9f8e11e6 100644 (file)
@@ -136,10 +136,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
        } else {
                ACPI_MOVE_NAME(filename, table->signature);
        }
-       filename[0] = (char)ACPI_TOLOWER(filename[0]);
-       filename[1] = (char)ACPI_TOLOWER(filename[1]);
-       filename[2] = (char)ACPI_TOLOWER(filename[2]);
-       filename[3] = (char)ACPI_TOLOWER(filename[3]);
+       filename[0] = (char)tolower((int)filename[0]);
+       filename[1] = (char)tolower((int)filename[1]);
+       filename[2] = (char)tolower((int)filename[2]);
+       filename[3] = (char)tolower((int)filename[3]);
        filename[ACPI_NAME_SIZE] = 0;
 
        /* Handle multiple SSDts - create different filenames for each */
@@ -147,10 +147,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
        if (instance > 0) {
                acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u",
                                 instance);
-               ACPI_STRCAT(filename, instance_str);
+               strcat(filename, instance_str);
        }
 
-       ACPI_STRCAT(filename, ACPI_TABLE_FILE_SUFFIX);
+       strcat(filename, ACPI_TABLE_FILE_SUFFIX);
 
        if (gbl_verbose_mode) {
                acpi_log_error