Module Name: src
Committed By: tsutsui
Date: Mon Jan 14 12:28:11 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: autoconf.c device.h
Log Message:
Use unsigned for device address.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/autoconf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/device.h
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/luna68k/stand/boot/autoconf.c
diff -u src/sys/arch/luna68k/stand/boot/autoconf.c:1.5 src/sys/arch/luna68k/stand/boot/autoconf.c:1.6
--- src/sys/arch/luna68k/stand/boot/autoconf.c:1.5 Mon Jan 14 12:17:17 2013
+++ src/sys/arch/luna68k/stand/boot/autoconf.c Mon Jan 14 12:28:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.5 2013/01/14 12:17:17 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.6 2013/01/14 12:28:11 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -136,8 +136,7 @@ find_controller(struct hp_hw *hw)
{
struct hp_ctlr *hc;
struct hp_ctlr *match_c;
- uint8_t *oaddr;
- char *addr;
+ uint8_t *addr, *oaddr;
#ifdef DEBUG
if (acdebug)
@@ -211,8 +210,7 @@ find_device(struct hp_hw *hw)
{
struct hp_device *hd;
struct hp_device *match_d;
- uint8_t *oaddr;
- char *addr;
+ uint8_t *addr, *oaddr;
#ifdef DEBUG
if (acdebug)
@@ -489,21 +487,21 @@ find_devs(void)
{
struct hp_hw *hw = sc_table;
- setup_hw(hw, (char *) 0x51000000, SIO, "uPD7201A (SIO)");
+ setup_hw(hw, (uint8_t *)0x51000000, SIO, "uPD7201A (SIO)");
hw++;
- setup_hw(hw, (char *) 0x51000004, KEYBOARD, "uPD7201A (KBD)");
+ setup_hw(hw, (uint8_t *)0x51000004, KEYBOARD, "uPD7201A (KBD)");
hw++;
- setup_hw(hw, (char *) 0xe1000000, SCSI, "MB89352 (SPC)");
+ setup_hw(hw, (uint8_t *)0xe1000000, SCSI, "MB89352 (SPC)");
hw++;
if (machtype == LUNA_II && !badaddr((void *) 0xe1000040)) {
- setup_hw(hw, (char *) 0xe1000040, SCSI, "MB89352 (SPC)");
+ setup_hw(hw, (uint8_t *)0xe1000040, SCSI, "MB89352 (SPC)");
hw++;
}
if (!badaddr((void *) 0xf1000000)) {
- setup_hw(hw, (char *) 0xf1000000, NET, "Am7990 (LANCE)");
+ setup_hw(hw, (uint8_t *)0xf1000000, NET, "Am7990 (LANCE)");
hw++;
}
}
Index: src/sys/arch/luna68k/stand/boot/device.h
diff -u src/sys/arch/luna68k/stand/boot/device.h:1.4 src/sys/arch/luna68k/stand/boot/device.h:1.5
--- src/sys/arch/luna68k/stand/boot/device.h:1.4 Mon Jan 14 12:17:17 2013
+++ src/sys/arch/luna68k/stand/boot/device.h Mon Jan 14 12:28:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.4 2013/01/14 12:17:17 tsutsui Exp $ */
+/* $NetBSD: device.h,v 1.5 2013/01/14 12:28:11 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -80,7 +80,7 @@ struct hp_ctlr {
struct driver *hp_driver;
int hp_unit;
int hp_alive;
- char *hp_addr;
+ uint8_t *hp_addr;
int hp_flags;
int hp_ipl;
};
@@ -91,7 +91,7 @@ struct hp_device {
int hp_unit;
int hp_ctlr;
int hp_slave;
- char *hp_addr;
+ uint8_t *hp_addr;
int hp_dk;
int hp_flags;
int hp_alive;
@@ -108,7 +108,7 @@ struct devqueue {
};
struct hp_hw {
- char *hw_addr; /* physical address of registers */
+ uint8_t *hw_addr; /* physical address of registers */
short hw_type; /* type (defined below) */
char *hw_name; /* HP product name */
};
