From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36925 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q6v63-0003VC-AD for qemu-devel@nongnu.org; Mon, 04 Apr 2011 21:30:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q6v61-00086b-4Y for qemu-devel@nongnu.org; Mon, 04 Apr 2011 21:30:18 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:52146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q6v60-000862-Td for qemu-devel@nongnu.org; Mon, 04 Apr 2011 21:30:17 -0400 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p351OpQm012608 for ; Mon, 4 Apr 2011 19:24:51 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p351UEmZ094896 for ; Mon, 4 Apr 2011 19:30:14 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p351UElI017547 for ; Mon, 4 Apr 2011 19:30:14 -0600 Message-Id: <20110405013013.310638565@linux.vnet.ibm.com> Date: Mon, 04 Apr 2011 21:29:42 -0400 From: Stefan Berger References: <20110405012939.098839448@linux.vnet.ibm.com> Content-Disposition: inline; filename=acpi_get_rsdp.diff Subject: [Qemu-devel] [PATCH V2 3/8] Add public get_rsdp function List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanb@linux.vnet.ibm.com, seabios@seabios.org Cc: qemu-devel@nongnu.org This patch adds a global get_rsdp() function call and refactors find_resume_vector() to call it. Signed-off-by: Stefan Berger --- src/acpi.c | 12 ++++++++++-- src/acpi.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) Index: seabios/src/acpi.c =================================================================== --- seabios.orig/src/acpi.c +++ seabios/src/acpi.c @@ -706,11 +706,19 @@ acpi_bios_init(void) dprintf(1, "ACPI tables: RSDP=%p RSDT=%p\n", rsdp, rsdt); } -u32 -find_resume_vector(void) +struct rsdp_descriptor * +get_rsdp(void) { dprintf(4, "rsdp=%p\n", RsdpAddr); if (!RsdpAddr || RsdpAddr->signature != RSDP_SIGNATURE) + return 0; + return RsdpAddr; +} + +u32 +find_resume_vector(void) +{ + if (!get_rsdp()) return 0; struct rsdt_descriptor_rev1 *rsdt = (void*)RsdpAddr->rsdt_physical_address; dprintf(4, "rsdt=%p\n", rsdt); Index: seabios/src/acpi.h =================================================================== --- seabios.orig/src/acpi.h +++ seabios/src/acpi.h @@ -4,6 +4,7 @@ #include "types.h" // u32 void acpi_bios_init(void); +struct rsdp_descriptor *get_rsdp(); u32 find_resume_vector(void); #define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "