Module Name: src
Committed By: jruoho
Date: Wed Apr 14 19:32:35 UTC 2010
Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c
src/sys/arch/x86/x86: acpi_machdep.c mpacpi.c
Log Message:
UINT32 -> uint32_t; UINT8 -> uint8_t.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/acpi/acpi_wakeup.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/x86/acpi_machdep.c
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/x86/x86/mpacpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.22 src/sys/arch/x86/acpi/acpi_wakeup.c:1.23
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.22 Sun Apr 11 09:52:09 2010
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Wed Apr 14 19:32:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.22 2010/04/11 09:52:09 jruoho Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.23 2010/04/14 19:32:35 jruoho Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.22 2010/04/11 09:52:09 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.23 2010/04/14 19:32:35 jruoho Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <takaw...@jp.freebsd.org>
@@ -190,7 +190,7 @@
{
ACPI_OBJECT_LIST ArgList;
ACPI_OBJECT Arg;
- UINT32 ret;
+ uint32_t ret;
ACPI_STATUS status;
/* run the _PTS and _GTS methods */
Index: src/sys/arch/x86/x86/acpi_machdep.c
diff -u src/sys/arch/x86/x86/acpi_machdep.c:1.25 src/sys/arch/x86/x86/acpi_machdep.c:1.26
--- src/sys/arch/x86/x86/acpi_machdep.c:1.25 Tue Aug 18 16:41:03 2009
+++ src/sys/arch/x86/x86/acpi_machdep.c Wed Apr 14 19:32:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.25 2009/08/18 16:41:03 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.26 2010/04/14 19:32:35 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.25 2009/08/18 16:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.26 2010/04/14 19:32:35 jruoho Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,7 @@
}
ACPI_STATUS
-acpi_md_OsInstallInterruptHandler(UINT32 InterruptNumber,
+acpi_md_OsInstallInterruptHandler(uint32_t InterruptNumber,
ACPI_OSD_HANDLER ServiceRoutine, void *Context, void **cookiep)
{
void *ih;
@@ -190,7 +190,7 @@
ACPI_STATUS
acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress,
- UINT32 Length, void **LogicalAddress)
+ uint32_t Length, void **LogicalAddress)
{
if (_x86_memio_map(X86_BUS_SPACE_MEM, PhysicalAddress, Length,
@@ -201,7 +201,7 @@
}
void
-acpi_md_OsUnmapMemory(void *LogicalAddress, UINT32 Length)
+acpi_md_OsUnmapMemory(void *LogicalAddress, uint32_t Length)
{
(void) _x86_memio_unmap(X86_BUS_SPACE_MEM,
@@ -223,7 +223,7 @@
}
BOOLEAN
-acpi_md_OsReadable(void *Pointer, UINT32 Length)
+acpi_md_OsReadable(void *Pointer, uint32_t Length)
{
BOOLEAN rv = TRUE;
vaddr_t sva, eva;
@@ -247,7 +247,7 @@
}
BOOLEAN
-acpi_md_OsWritable(void *Pointer, UINT32 Length)
+acpi_md_OsWritable(void *Pointer, uint32_t Length)
{
BOOLEAN rv = FALSE;
vaddr_t sva, eva;
Index: src/sys/arch/x86/x86/mpacpi.c
diff -u src/sys/arch/x86/x86/mpacpi.c:1.85 src/sys/arch/x86/x86/mpacpi.c:1.86
--- src/sys/arch/x86/x86/mpacpi.c:1.85 Thu Apr 8 04:40:51 2010
+++ src/sys/arch/x86/x86/mpacpi.c Wed Apr 14 19:32:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpacpi.c,v 1.85 2010/04/08 04:40:51 jruoho Exp $ */
+/* $NetBSD: mpacpi.c,v 1.86 2010/04/14 19:32:35 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.85 2010/04/08 04:40:51 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1.86 2010/04/14 19:32:35 jruoho Exp $");
#include "acpica.h"
#include "opt_acpi.h"
@@ -112,7 +112,7 @@
#if NPCI > 0
/* Callbacks for the ACPI namespace walk */
-static ACPI_STATUS mpacpi_pcibus_cb(ACPI_HANDLE, UINT32, void *, void **);
+static ACPI_STATUS mpacpi_pcibus_cb(ACPI_HANDLE, uint32_t, void *, void **);
static int mpacpi_derive_bus(ACPI_HANDLE, struct acpi_softc *);
static int mpacpi_pcircount(struct mpacpi_pcibus *);
@@ -689,7 +689,7 @@
* PCI root and subordinate busses.
*/
static ACPI_STATUS
-mpacpi_pcibus_cb(ACPI_HANDLE handle, UINT32 level, void *p,
+mpacpi_pcibus_cb(ACPI_HANDLE handle, uint32_t level, void *p,
void **status)
{
ACPI_STATUS rv;
@@ -901,7 +901,7 @@
{
int count = 0;
ACPI_PCI_ROUTING_TABLE *PrtElement;
- UINT8 *Buffer;
+ uint8_t *Buffer;
for (Buffer = mpr->mpr_buf.Pointer;; Buffer += PrtElement->Length) {
PrtElement = (ACPI_PCI_ROUTING_TABLE *)Buffer;
