Changeset f4c2b6a in mainline for kernel/genarch/src

Timestamp:

2008-06-03T14:59:48Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2c4fb51

Parents:

b63f8569

Message:

reflect changes in generic code
proper formatting directives
coding style

Location:

kernel/genarch/src/acpi

Files:

• acpi.c (modified) (4 diffs)
• madt.c (modified) (3 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -106 +106 @@
                                         goto next;
                                 *signature_map[j].sdt_ptr = h;
-                                printf("%#zp: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
                         }
                 }
@@ -127 +127 @@
                                         goto next;
                                 *signature_map[j].sdt_ptr = h;
-                                printf("%#zp: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                                printf("%p: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
                         }
                 }
@@ -161 +161 @@
 
 rsdp_found:
-        printf("%#zp: ACPI Root System Description Pointer\n", acpi_rsdp);
+        printf("%p: ACPI Root System Description Pointer\n", acpi_rsdp);
 
         acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;
@@ -170 +170 @@
 
         if (acpi_rsdt && !acpi_sdt_check((uint8_t *) acpi_rsdt)) {
-                printf("RSDT: %s\n", "bad checksum");
+                printf("RSDT: bad checksum\n");
                 return;
         }
         if (acpi_xsdt && !acpi_sdt_check((uint8_t *) acpi_xsdt)) {
-                printf("XSDT: %s\n", "bad checksum");
+                printf("XSDT: bad checksum\n");
                 return;
         }

kernel/genarch/src/acpi/madt.c

@@ -127 +127 @@
 int madt_irq_to_pin(unsigned int irq)
 {
-        ASSERT(irq < sizeof(isa_irq_map)/sizeof(int));
+        ASSERT(irq < sizeof(isa_irq_map) / sizeof(int));
         return isa_irq_map[irq];
 }
@@ -185 +185 @@
                                 case MADT_L_SAPIC:
                                 case MADT_PLATFORM_INTR_SRC:
-                                        printf("MADT: skipping %s entry (type=%zd)\n", entry[h->type], h->type);
+                                        printf("MADT: skipping %s entry (type=%" PRIu8 ")\n", entry[h->type], h->type);
                                         break;
         
                                 default:
                                         if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
-                                                printf("MADT: skipping reserved entry (type=%zd)\n", h->type);
+                                                printf("MADT: skipping reserved entry (type=%" PRIu8 ")\n", h->type);
                                         }
                                         if (h->type >= MADT_RESERVED_OEM_BEGIN) {
-                                                printf("MADT: skipping OEM entry (type=%zd)\n", h->type);
+                                                printf("MADT: skipping OEM entry (type=%" PRIu8 ")\n", h->type);
                                         }
                                         break;
@@ -234 +234 @@
 void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, uint32_t index)
 {
-        ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));
-        printf("MADT: ignoring %s entry: bus=%zd, source=%zd, global_int=%zd, flags=%#hx\n",
+        ASSERT(override->source < sizeof(isa_irq_map) / sizeof(int));
+        printf("MADT: ignoring %s entry: bus=%" PRIu8 ", source=%" PRIu8 ", global_int=%" PRIu32 ", flags=%#" PRIx16 "\n",
                 entry[override->header.type], override->bus, override->source,
                 override->global_int, override->flags);