Module Name: src
Committed By: jruoho
Date: Mon Oct 25 07:48:04 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_acad.c acpi_bat.c acpi_button.c acpi_lid.c
thinkpad_acpi.c
src/sys/modules/acpiacad: Makefile
src/sys/modules/acpibat: Makefile
src/sys/modules/acpibut: Makefile
src/sys/modules/acpilid: Makefile
src/sys/modules/thinkpad: Makefile
Log Message:
Bump WARNS to 4.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/acpiacad/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/acpibat/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/acpibut/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/acpilid/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/thinkpad/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.45 src/sys/dev/acpi/acpi_acad.c:1.46
--- src/sys/dev/acpi/acpi_acad.c:1.45 Sat Aug 14 05:41:22 2010
+++ src/sys/dev/acpi/acpi_acad.c Mon Oct 25 07:48:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.45 2010/08/14 05:41:22 jruoho Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.46 2010/10/25 07:48:03 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.45 2010/08/14 05:41:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.46 2010/10/25 07:48:03 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -189,7 +189,7 @@
goto fail;
}
- if (sc->sc_status != status) {
+ if (sc->sc_status != (int)status) {
/*
* If status has changed, send the event:
@@ -315,7 +315,7 @@
.cf_pspec = &acpiparent,
},
- { NULL }
+ { NULL, NULL, 0, 0, NULL, 0, NULL }
};
static int
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.104 src/sys/dev/acpi/acpi_bat.c:1.105
--- src/sys/dev/acpi/acpi_bat.c:1.104 Sat Aug 14 05:41:22 2010
+++ src/sys/dev/acpi/acpi_bat.c Mon Oct 25 07:48:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.104 2010/08/14 05:41:22 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.105 2010/10/25 07:48:03 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.104 2010/08/14 05:41:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.105 2010/10/25 07:48:03 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -179,7 +179,7 @@
static void acpibat_attach(device_t, device_t, void *);
static int acpibat_detach(device_t, int);
static int acpibat_get_sta(device_t);
-static ACPI_OBJECT *acpibat_get_object(ACPI_HANDLE, const char *, int);
+static ACPI_OBJECT *acpibat_get_object(ACPI_HANDLE, const char *, uint32_t);
static void acpibat_get_info(device_t);
static void acpibat_print_info(device_t, ACPI_OBJECT *);
static void acpibat_get_status(device_t);
@@ -311,7 +311,7 @@
}
static ACPI_OBJECT *
-acpibat_get_object(ACPI_HANDLE hdl, const char *pth, int count)
+acpibat_get_object(ACPI_HANDLE hdl, const char *pth, uint32_t count)
{
ACPI_OBJECT *obj;
ACPI_BUFFER buf;
@@ -347,9 +347,10 @@
{
struct acpibat_softc *sc = device_private(dv);
ACPI_HANDLE hdl = sc->sc_node->ad_handle;
- int capunit, i, rateunit, val;
ACPI_OBJECT *elm, *obj;
ACPI_STATUS rv = AE_OK;
+ int capunit, i, rateunit;
+ uint64_t val;
obj = acpibat_get_object(hdl, "_BIF", ACPIBAT_BIF_COUNT);
@@ -505,9 +506,10 @@
{
struct acpibat_softc *sc = device_private(dv);
ACPI_HANDLE hdl = sc->sc_node->ad_handle;
- int i, rate, state, val;
ACPI_OBJECT *elm, *obj;
ACPI_STATUS rv = AE_OK;
+ int i, rate, state;
+ uint64_t val;
obj = acpibat_get_object(hdl, "_BST", ACPIBAT_BST_COUNT);
Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.38 src/sys/dev/acpi/acpi_button.c:1.39
--- src/sys/dev/acpi/acpi_button.c:1.38 Tue Aug 24 15:03:34 2010
+++ src/sys/dev/acpi/acpi_button.c Mon Oct 25 07:48:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.38 2010/08/24 15:03:34 jruoho Exp $ */
+/* $NetBSD: acpi_button.c,v 1.39 2010/10/25 07:48:03 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.38 2010/08/24 15:03:34 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.39 2010/10/25 07:48:03 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -214,7 +214,7 @@
.cf_pspec = &acpiparent,
},
- { NULL }
+ { NULL, NULL, 0, 0, NULL, 0, NULL }
};
static int
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.41 src/sys/dev/acpi/acpi_lid.c:1.42
--- src/sys/dev/acpi/acpi_lid.c:1.41 Tue Aug 24 15:03:34 2010
+++ src/sys/dev/acpi/acpi_lid.c Mon Oct 25 07:48:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.41 2010/08/24 15:03:34 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.42 2010/10/25 07:48:03 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.41 2010/08/24 15:03:34 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.42 2010/10/25 07:48:03 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -196,7 +196,7 @@
.cf_pspec = &acpiparent,
},
- { NULL }
+ { NULL, NULL, 0, 0, NULL, 0, NULL }
};
static int
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.30 src/sys/dev/acpi/thinkpad_acpi.c:1.31
--- src/sys/dev/acpi/thinkpad_acpi.c:1.30 Thu Apr 15 07:02:24 2010
+++ src/sys/dev/acpi/thinkpad_acpi.c Mon Oct 25 07:48:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.30 2010/04/15 07:02:24 jruoho Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.31 2010/10/25 07:48:03 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.30 2010/04/15 07:02:24 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.31 2010/10/25 07:48:03 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -679,7 +679,7 @@
.cf_pspec = &acpiparent,
},
- { NULL }
+ { NULL, NULL, 0, 0, NULL, 0, NULL }
};
static int
Index: src/sys/modules/acpiacad/Makefile
diff -u src/sys/modules/acpiacad/Makefile:1.1 src/sys/modules/acpiacad/Makefile:1.2
--- src/sys/modules/acpiacad/Makefile:1.1 Sun Feb 28 17:40:51 2010
+++ src/sys/modules/acpiacad/Makefile Mon Oct 25 07:48:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/28 17:40:51 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
.include "../Makefile.inc"
@@ -7,4 +7,6 @@
KMOD= acpiacad
SRCS= acpi_acad.c
+WARNS= 4
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/acpibat/Makefile
diff -u src/sys/modules/acpibat/Makefile:1.2 src/sys/modules/acpibat/Makefile:1.3
--- src/sys/modules/acpibat/Makefile:1.2 Sun Mar 21 07:09:56 2010
+++ src/sys/modules/acpibat/Makefile Mon Oct 25 07:48:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/03/21 07:09:56 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/10/25 07:48:04 jruoho Exp $
.include "../Makefile.inc"
@@ -8,4 +8,6 @@
IOCONF= ACPIBAT.ioconf
SRCS= acpi_bat.c
+WARNS= 4
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/acpibut/Makefile
diff -u src/sys/modules/acpibut/Makefile:1.1 src/sys/modules/acpibut/Makefile:1.2
--- src/sys/modules/acpibut/Makefile:1.1 Sun Feb 28 17:40:51 2010
+++ src/sys/modules/acpibut/Makefile Mon Oct 25 07:48:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/28 17:40:51 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
.include "../Makefile.inc"
@@ -7,4 +7,6 @@
KMOD= acpibut
SRCS= acpi_button.c
+WARNS= 4
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/acpilid/Makefile
diff -u src/sys/modules/acpilid/Makefile:1.1 src/sys/modules/acpilid/Makefile:1.2
--- src/sys/modules/acpilid/Makefile:1.1 Sun Feb 28 17:40:51 2010
+++ src/sys/modules/acpilid/Makefile Mon Oct 25 07:48:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/28 17:40:51 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:03 jruoho Exp $
.include "../Makefile.inc"
@@ -7,4 +7,6 @@
KMOD= acpilid
SRCS= acpi_lid.c
+WARNS= 4
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/thinkpad/Makefile
diff -u src/sys/modules/thinkpad/Makefile:1.1 src/sys/modules/thinkpad/Makefile:1.2
--- src/sys/modules/thinkpad/Makefile:1.1 Sun Feb 28 17:40:51 2010
+++ src/sys/modules/thinkpad/Makefile Mon Oct 25 07:48:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/02/28 17:40:51 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
.include "../Makefile.inc"
@@ -7,4 +7,6 @@
KMOD= thinkpad
SRCS= thinkpad_acpi.c
+WARNS= 4
+
.include <bsd.kmodule.mk>
