Date: Thu, 4 Sep 2003 12:48:47 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 37521 for review Message-ID: <200309041948.h84Jml55044449@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=37521 Change 37521 by marcel@marcel_nfs on 2003/09/04 12:48:36 Patch 2: cleanup use of acpi_print_sdt(). Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#15 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi.c#15 (text+ko) ==== @@ -55,7 +55,7 @@ static void acpi_print_apic(struct MADT_APIC *mp); static void acpi_handle_apic(struct ACPIsdt *sdp); static void acpi_handle_hpet(struct ACPIsdt *sdp); -static void acpi_print_sdt(struct ACPIsdt *sdp, int endcomment); +static void acpi_print_sdt(struct ACPIsdt *sdp); static void acpi_print_facp(struct FACPbody *facp); static void acpi_print_dsdt(struct ACPIsdt *dsdp); static struct ACPIsdt * @@ -237,7 +237,8 @@ struct MADTbody *madtp; struct MADT_APIC *madt_apicp; - acpi_print_sdt(sdp, /*endcomment*/0); + printf(BEGIN_COMMENT); + acpi_print_sdt(sdp); madtp = (struct MADTbody *) sdp->body; printf("\tLocal APIC ADDR=0x%08x\n", madtp->lapic_addr); printf("\tFlags={"); @@ -259,7 +260,8 @@ { struct HPETbody *hpetp; - acpi_print_sdt(sdp, /*endcomment*/0); + printf(BEGIN_COMMENT); + acpi_print_sdt(sdp); hpetp = (struct HPETbody *) sdp->body; printf("\tHPET Number=%d\n", hpetp->hpet_number); printf("\tADDR=0x%08x\n", hpetp->base_addr); @@ -277,9 +279,9 @@ } static void -acpi_print_sdt(struct ACPIsdt *sdp, int endcomment) +acpi_print_sdt(struct ACPIsdt *sdp) { - printf(BEGIN_COMMENT " "); + printf(" "); acpi_print_string(sdp->signature, 4); printf(": Length=%d, Revision=%d, Checksum=%d,\n", sdp->len, sdp->rev, sdp->check); @@ -291,16 +293,15 @@ printf("\tCreator ID="); acpi_print_string(sdp->creator, 4); printf(", Creator Revision=0x%x\n", sdp->crerev); - if (endcomment) - printf(END_COMMENT); } static void acpi_print_rsdt(struct ACPIsdt *rsdp) { - int i, entries; + int i, entries; - acpi_print_sdt(rsdp, /*endcomment*/0); + printf(BEGIN_COMMENT); + acpi_print_sdt(rsdp); entries = (rsdp->len - SIZEOF_SDT_HDR) / sizeof(u_int32_t); printf("\tEntries={ "); for (i = 0; i < entries; i++) { @@ -395,7 +396,9 @@ static void acpi_print_dsdt(struct ACPIsdt *dsdp) { - acpi_print_sdt(dsdp, /*endcomment*/1); + printf(BEGIN_COMMENT); + acpi_print_sdt(dsdp); + printf(END_COMMENT); } int @@ -451,8 +454,8 @@ int entries; struct ACPIsdt *sdp; + acpi_print_rsdt(rsdp); entries = (rsdp->len - SIZEOF_SDT_HDR) / sizeof(u_int32_t); - acpi_print_rsdt(rsdp); for (i = 0; i < entries; i++) { sdp = (struct ACPIsdt *)acpi_map_sdt(rsdp->body[i]); if (acpi_checksum(sdp, sdp->len)) @@ -464,7 +467,7 @@ else if (!memcmp(sdp->signature, "HPET", 4)) acpi_handle_hpet(sdp); else - acpi_print_sdt(sdp, /*endcomment*/1); + acpi_print_dsdt(sdp); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309041948.h84Jml55044449>