[src/netbsd-1-4]: src/sys/arch/x68k/dev pullup 1.3->1.4 (minoura)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9179a13a58c
branches:  netbsd-1-4
changeset: 468423:b9179a13a58c
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Apr 22 15:24:31 1999 +0000

description:
pullup 1.3->1.4 (minoura)

diffstat:

 sys/arch/x68k/dev/scsirom.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 9045b31abfa3 -r b9179a13a58c sys/arch/x68k/dev/scsirom.c
--- a/sys/arch/x68k/dev/scsirom.c       Thu Apr 22 15:22:44 1999 +0000
+++ b/sys/arch/x68k/dev/scsirom.c       Thu Apr 22 15:24:31 1999 +0000
@@ -1,10 +1,12 @@
-/*     $NetBSD: scsirom.c,v 1.3 1999/03/24 14:07:39 minoura Exp $      */
+/*     $NetBSD: scsirom.c,v 1.3.2.1 1999/04/22 15:24:31 perry Exp $    */
 
-/*
- *
+/*-
  * Copyright (c) 1999 NetBSD Foundation, Inc.
  * All rights reserved.
  *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -93,7 +95,10 @@
 
        if (bus_space_map (ia->ia_bst, ia->ia_addr, ia->ia_size, 0, &ioh) < 0)
                return -1;
-       bus_space_read_region_1 (ia->ia_bst, ioh, SCSIROM_ID, buf, 6);
+       if (badaddr ((caddr_t)INTIO_ADDR(ia->ia_addr+SCSIROM_ID))) {
+               bus_space_unmap (ia->ia_bst, ioh, ia->ia_size);
+               return -1;
+       }
        if (memcmp(buf, scsirom_descr[which].id, 6) == 0)
                r = which;
        bus_space_unmap (ia->ia_bst, ioh, ia->ia_size);