default CD-ROM drive is /dev/cd0c on NetBSD

This commit is contained in:
cebix 2002-04-28 14:06:17 +00:00
parent 00a32a9afb
commit cc423d283f
2 changed files with 3 additions and 3 deletions

View File

@ -208,10 +208,8 @@ void SysAddCDROMPrefs(void)
closedir(cd_dir);
}
}
#elif defined(__FreeBSD__)
#elif defined(__FreeBSD__) || defined(__NetBSD__)
PrefsAddString("cdrom", "/dev/cd0c");
#elif defined(__NetBSD__)
PrefsAddString("cdrom", "/dev/cd0d");
#endif
}

View File

@ -180,11 +180,13 @@ static void find_hfs_partition(cdrom_drive_info &info)
{
info.start_byte = 0;
uint8 *map = new uint8[512];
D(bug("Looking for HFS partitions on CD-ROM...\n"));
// Search first 64 blocks for HFS partition
for (int i=0; i<64; i++) {
if (Sys_read(info.fh, map, i * 512, 512) != 512)
break;
D(bug(" block %d, signature '%c%c' (%02x%02x)\n", i, map[0], map[1], map[0], map[1]));
// Not a partition map block? Then look at next block
uint16 sig = (map[0] << 8) | map[1];