← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-rt/lucid

« back to all changes in this revision

Viewing changes to drivers/acpi/acpica/exstore.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-08-05 23:00:52 UTC
  • Revision ID: james.westby@ubuntu.com-20090805230052-7xedvqcyk9dnnxb2
Tags: 2.6.31-1.1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/acpi/acpica/exstore.c
129
129
 
130
130
        /* source_desc is of type ACPI_DESC_TYPE_OPERAND */
131
131
 
132
 
        switch (ACPI_GET_OBJECT_TYPE(source_desc)) {
 
132
        switch (source_desc->common.type) {
133
133
        case ACPI_TYPE_INTEGER:
134
134
 
135
135
                /* Output correct integer width */
193
193
 
194
194
                case ACPI_REFCLASS_TABLE:
195
195
 
 
196
                        /* Case for ddb_handle */
 
197
 
196
198
                        ACPI_DEBUG_PRINT_RAW((ACPI_DB_DEBUG_OBJECT,
197
199
                                              "Table Index 0x%X\n",
198
200
                                              source_desc->reference.value));
199
 
                        break;
 
201
                        return;
200
202
 
201
203
                default:
202
204
                        break;
324
326
 
325
327
        /* Destination object must be a Reference or a Constant object */
326
328
 
327
 
        switch (ACPI_GET_OBJECT_TYPE(dest_desc)) {
 
329
        switch (dest_desc->common.type) {
328
330
        case ACPI_TYPE_LOCAL_REFERENCE:
329
331
                break;
330
332
 
460
462
                 */
461
463
                obj_desc = *(index_desc->reference.where);
462
464
 
463
 
                if (ACPI_GET_OBJECT_TYPE(source_desc) ==
464
 
                    ACPI_TYPE_LOCAL_REFERENCE
465
 
                    && source_desc->reference.class == ACPI_REFCLASS_TABLE) {
 
465
                if (source_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE &&
 
466
                    source_desc->reference.class == ACPI_REFCLASS_TABLE) {
466
467
 
467
468
                        /* This is a DDBHandle, just add a reference to it */
468
469
 
520
521
                 * by the INDEX_OP code.
521
522
                 */
522
523
                obj_desc = index_desc->reference.object;
523
 
                if ((ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_BUFFER) &&
524
 
                    (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_STRING)) {
 
524
                if ((obj_desc->common.type != ACPI_TYPE_BUFFER) &&
 
525
                    (obj_desc->common.type != ACPI_TYPE_STRING)) {
525
526
                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
526
527
                }
527
528
 
529
530
                 * The assignment of the individual elements will be slightly
530
531
                 * different for each source type.
531
532
                 */
532
 
                switch (ACPI_GET_OBJECT_TYPE(source_desc)) {
 
533
                switch (source_desc->common.type) {
533
534
                case ACPI_TYPE_INTEGER:
534
535
 
535
536
                        /* Use the least-significant byte of the integer */
707
708
                /* No conversions for all other types.  Just attach the source object */
708
709
 
709
710
                status = acpi_ns_attach_object(node, source_desc,
710
 
                                               ACPI_GET_OBJECT_TYPE
711
 
                                               (source_desc));
 
711
                                               source_desc->common.type);
712
712
                break;
713
713
        }
714
714