Module Name: src
Committed By: matt
Date: Wed Dec 15 00:05:47 UTC 2010
Modified Files:
src/sys/arch/mips/adm5120: adm5120_extio.c adm5120_obio.c
src/sys/arch/mips/atheros: arbus.c
Log Message:
Make these compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/adm5120_extio.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/adm5120/adm5120_obio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/atheros/arbus.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/mips/adm5120/adm5120_extio.c
diff -u src/sys/arch/mips/adm5120/adm5120_extio.c:1.2 src/sys/arch/mips/adm5120/adm5120_extio.c:1.3
--- src/sys/arch/mips/adm5120/adm5120_extio.c:1.2 Fri Oct 24 22:16:26 2008
+++ src/sys/arch/mips/adm5120/adm5120_extio.c Wed Dec 15 00:05:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_extio.c,v 1.2 2008/10/24 22:16:26 dyoung Exp $ */
+/* $NetBSD: adm5120_extio.c,v 1.3 2010/12/15 00:05:47 matt Exp $ */
/*-
* Copyright (c) 2007 David Young. All rights reserved.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.2 2008/10/24 22:16:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_extio.c,v 1.3 2010/12/15 00:05:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -408,7 +408,7 @@
if (ea->ea_cfio != EXTIOCF_CFIO_DEFAULT)
aprint_normal(" cfio");
if (ea->ea_addr != EXTIOCF_ADDR_DEFAULT)
- aprint_normal(" addr 0x%lx", ea->ea_addr);
+ aprint_normal(" addr 0x%" PRIxBUSADDR, ea->ea_addr);
if (ea->ea_gpio_mask != EXTIOCF_GPIO_MASK_DEFAULT)
aprint_normal(" gpio_mask 0x%02x", ea->ea_gpio_mask);
Index: src/sys/arch/mips/adm5120/adm5120_obio.c
diff -u src/sys/arch/mips/adm5120/adm5120_obio.c:1.1 src/sys/arch/mips/adm5120/adm5120_obio.c:1.2
--- src/sys/arch/mips/adm5120/adm5120_obio.c:1.1 Tue Mar 20 08:52:03 2007
+++ src/sys/arch/mips/adm5120/adm5120_obio.c Wed Dec 15 00:05:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: adm5120_obio.c,v 1.1 2007/03/20 08:52:03 dyoung Exp $ */
+/* $NetBSD: adm5120_obio.c,v 1.2 2010/12/15 00:05:47 matt Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.1 2007/03/20 08:52:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm5120_obio.c,v 1.2 2010/12/15 00:05:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@
if (pnp != NULL)
aprint_normal("%s at %s", oa->oba_name, pnp);
if (oa->oba_addr != OBIOCF_ADDR_DEFAULT)
- aprint_normal(" addr 0x%lx", oa->oba_addr);
+ aprint_normal(" addr 0x%" PRIxBUSADDR, oa->oba_addr);
if (oa->oba_gpio_mask != OBIOCF_GPIO_MASK_DEFAULT)
aprint_normal(" gpio_mask 0x%02x", oa->oba_gpio_mask);
Index: src/sys/arch/mips/atheros/arbus.c
diff -u src/sys/arch/mips/atheros/arbus.c:1.10 src/sys/arch/mips/atheros/arbus.c:1.11
--- src/sys/arch/mips/atheros/arbus.c:1.10 Mon Sep 4 05:17:26 2006
+++ src/sys/arch/mips/atheros/arbus.c Wed Dec 15 00:05:46 2010
@@ -1,4 +1,4 @@
-/* $Id: arbus.c,v 1.10 2006/09/04 05:17:26 gdamore Exp $ */
+/* $Id: arbus.c,v 1.11 2010/12/15 00:05:46 matt Exp $ */
/*
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
* Copyright (c) 2006 Garrett D'Amore.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.10 2006/09/04 05:17:26 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.11 2010/12/15 00:05:46 matt Exp $");
#include "locators.h"
#include <sys/param.h>
@@ -150,7 +150,7 @@
aprint_normal("%s at %s", aa->aa_name, pnp);
if (aa->aa_addr)
- aprint_normal(" addr 0x%lx", aa->aa_addr);
+ aprint_normal(" addr 0x%" PRIxBUSADDR, aa->aa_addr);
if (aa->aa_cirq >= 0)
aprint_normal(" cpu irq %d", aa->aa_cirq);
