Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bus error occurred on such machines without the SCSI ROM.

Browse Source 
Insert badaddr() check before read the ROM.
This commit is contained in:
minoura 1999-04-22 12:55:53 +00:00
parent ca053f4364
commit f9afee1b29
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/x68k/dev/scsirom.c
View File

@ -1,10 +1,12 @@
/* $NetBSD: scsirom.c,v 1.3 1999/03/24 14:07:39 minoura Exp $ */ /* $NetBSD: scsirom.c,v 1.4 1999/04/22 12:55:53 minoura Exp $ */
/* /*-
*
* Copyright (c) 1999 NetBSD Foundation, Inc. * Copyright (c) 1999 NetBSD Foundation, Inc.
* All rights reserved. * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -93,7 +95,10 @@ scsirom_find (parent, ia)
if (bus_space_map (ia->ia_bst, ia->ia_addr, ia->ia_size, 0, &ioh) < 0) if (bus_space_map (ia->ia_bst, ia->ia_addr, ia->ia_size, 0, &ioh) < 0)
return -1; 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) if (memcmp(buf, scsirom_descr[which].id, 6) == 0)
r = which; r = which;
bus_space_unmap (ia->ia_bst, ioh, ia->ia_size); bus_space_unmap (ia->ia_bst, ioh, ia->ia_size);