mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Merged from sys/isa/fd.c revisions 1.224 and 1.241.

Browse Source
This commit is contained in:
Yoshihiro Takahashi 2002-10-07 13:05:45 +00:00
parent e74334caae
commit 88b2247e41
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=104619
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/pc98/cbus/fdc.c
View File

@ -1289,8 +1289,10 @@ fdc_add_child(device_t dev, const char *name, int unit)
if (resource_int_value(name, unit, "drive", &ivar->fdunit) != 0) if (resource_int_value(name, unit, "drive", &ivar->fdunit) != 0)
ivar->fdunit = 0; ivar->fdunit = 0;
child = device_add_child(dev, name, unit); child = device_add_child(dev, name, unit);
if (child == NULL) if (child == NULL) {
free(ivar, M_DEVBUF);
return; return;
}
device_set_ivars(child, ivar); device_set_ivars(child, ivar);
if (resource_int_value(name, unit, "flags", &flags) == 0) if (resource_int_value(name, unit, "flags", &flags) == 0)
device_set_flags(child, flags); device_set_flags(child, flags);
@ -1546,7 +1548,13 @@ fd_probe(device_t dev)
#endif /* EPSON_NRDISK */ #endif /* EPSON_NRDISK */
} }
#else /* PC98 */ #else /* PC98 */
#if _MACHINE_ARCH == i386 /*
* XXX I think using __i386__ is wrong here since we actually want to probe
* for the machine type, not the CPU type (so non-PC arch's like the PC98 will
* fail the probe). However, for whatever reason, testing for _MACHINE_ARCH
* == i386 breaks the test on FreeBSD/Alpha.
*/
#ifdef __i386__
if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) { if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) {
/* Look up what the BIOS thinks we have. */ /* Look up what the BIOS thinks we have. */
if (fd->fdu == 0) { if (fd->fdu == 0) {
@ -1566,7 +1574,7 @@ fd_probe(device_t dev)
if (fd->type == FDT_288M_1) if (fd->type == FDT_288M_1)
fd->type = FDT_288M; fd->type = FDT_288M;
} }
#endif /* _MACHINE_ARCH == i386 */ #endif /* __i386__ */
#endif /* PC98 */ #endif /* PC98 */
/* is there a unit? */ /* is there a unit? */

14
sys/pc98/pc98/fd.c
View File

@ -1289,8 +1289,10 @@ fdc_add_child(device_t dev, const char *name, int unit)
if (resource_int_value(name, unit, "drive", &ivar->fdunit) != 0) if (resource_int_value(name, unit, "drive", &ivar->fdunit) != 0)
ivar->fdunit = 0; ivar->fdunit = 0;
child = device_add_child(dev, name, unit); child = device_add_child(dev, name, unit);
if (child == NULL) if (child == NULL) {
free(ivar, M_DEVBUF);
return; return;
}
device_set_ivars(child, ivar); device_set_ivars(child, ivar);
if (resource_int_value(name, unit, "flags", &flags) == 0) if (resource_int_value(name, unit, "flags", &flags) == 0)
device_set_flags(child, flags); device_set_flags(child, flags);
@ -1546,7 +1548,13 @@ fd_probe(device_t dev)
#endif /* EPSON_NRDISK */ #endif /* EPSON_NRDISK */
} }
#else /* PC98 */ #else /* PC98 */
#if _MACHINE_ARCH == i386 /*
* XXX I think using __i386__ is wrong here since we actually want to probe
* for the machine type, not the CPU type (so non-PC arch's like the PC98 will
* fail the probe). However, for whatever reason, testing for _MACHINE_ARCH
* == i386 breaks the test on FreeBSD/Alpha.
*/
#ifdef __i386__
if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) { if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) {
/* Look up what the BIOS thinks we have. */ /* Look up what the BIOS thinks we have. */
if (fd->fdu == 0) { if (fd->fdu == 0) {
@ -1566,7 +1574,7 @@ fd_probe(device_t dev)
if (fd->type == FDT_288M_1) if (fd->type == FDT_288M_1)
fd->type = FDT_288M; fd->type = FDT_288M;
} }
#endif /* _MACHINE_ARCH == i386 */ #endif /* __i386__ */
#endif /* PC98 */ #endif /* PC98 */
/* is there a unit? */ /* is there a unit? */