forked from Lainports/freebsd-ports
121975e176
- Fixup working with /dev/fd0 - Add patch from PR/52310 - send a DHCP CLASS_ID tag - Bump PORTREVISION PR: ports/62141 Submitted by: maintainer
117 lines
2.9 KiB
C
117 lines
2.9 KiB
C
--- lib/device.c.orig Sat Jan 17 18:57:57 2004
|
|
+++ lib/device.c Sat Jan 31 06:32:24 2004
|
|
@@ -78,6 +78,12 @@
|
|
# include <sys/ioctl.h> /* ioctl */
|
|
# include <sys/disklabel.h>
|
|
# include <sys/cdio.h> /* CDIOCCLRDEBUG */
|
|
+#if defined(__FreeBSD__)
|
|
+#include <sys/param.h>
|
|
+#if __FreeBSD_version >= 500040
|
|
+#include <sys/disk.h>
|
|
+#endif
|
|
+#endif
|
|
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
|
|
|
|
#ifdef HAVE_OPENDISK
|
|
@@ -94,8 +100,16 @@
|
|
{
|
|
int fd;
|
|
|
|
- fd = open (map[drive], O_RDONLY);
|
|
- assert (fd >= 0);
|
|
+#if defined(__FreeBSD__)
|
|
+ if(geom->flags == -1)
|
|
+ {
|
|
+#endif
|
|
+ fd = open (map[drive], O_RDONLY);
|
|
+ assert (fd >= 0);
|
|
+#if defined(__FreeBSD__)
|
|
+ } else
|
|
+ fd = geom->flags;
|
|
+#endif
|
|
|
|
#if defined(__linux__)
|
|
/* Linux */
|
|
@@ -123,6 +137,7 @@
|
|
/* FreeBSD, NetBSD or OpenBSD */
|
|
{
|
|
struct disklabel hdg;
|
|
+#if __FreeBSD_version < 500040
|
|
if (ioctl (fd, DIOCGDINFO, &hdg))
|
|
goto fail;
|
|
|
|
@@ -131,7 +146,40 @@
|
|
geom->sectors = hdg.d_nsectors;
|
|
geom->total_sectors = hdg.d_secperunit;
|
|
|
|
- close (fd);
|
|
+#else
|
|
+ u_int u, secsize;
|
|
+ off_t mediasize;
|
|
+
|
|
+ if(ioctl(fd, DIOCGSECTORSIZE, &secsize) != 0)
|
|
+ secsize = 512;
|
|
+
|
|
+ if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) != 0)
|
|
+ goto fail;
|
|
+
|
|
+ hdg.d_secperunit = mediasize / secsize;
|
|
+
|
|
+ if (ioctl(fd, DIOCGFWSECTORS, &u) == 0)
|
|
+ hdg.d_nsectors = u;
|
|
+ else
|
|
+ hdg.d_nsectors = 63;
|
|
+ if (ioctl(fd, DIOCGFWHEADS, &u) == 0)
|
|
+ hdg.d_ntracks = u;
|
|
+ else if (hdg.d_secperunit <= 63*1*1024)
|
|
+ hdg.d_ntracks = 1;
|
|
+ else if (hdg.d_secperunit <= 63*16*1024)
|
|
+ hdg.d_ntracks = 16;
|
|
+ else
|
|
+ hdg.d_ntracks = 255;
|
|
+ hdg.d_secpercyl = hdg.d_ntracks * hdg.d_nsectors;
|
|
+ hdg.d_ncylinders = hdg.d_secperunit / hdg.d_secpercyl;
|
|
+
|
|
+ geom->cylinders = hdg.d_ncylinders;
|
|
+ geom->heads = hdg.d_ntracks;
|
|
+ geom->sectors = hdg.d_nsectors;
|
|
+ geom->total_sectors = hdg.d_secperunit;
|
|
+#endif
|
|
+ if(geom->flags == -1)
|
|
+ close (fd);
|
|
return;
|
|
}
|
|
|
|
@@ -203,7 +251,11 @@
|
|
sprintf (name, "/dev/fd%d", unit);
|
|
#elif defined(__FreeBSD__)
|
|
/* FreeBSD */
|
|
+#if __FreeBSD__ >= 4
|
|
+ sprintf (name, "/dev/fd%d", unit);
|
|
+#else
|
|
sprintf (name, "/dev/rfd%d", unit);
|
|
+#endif
|
|
#elif defined(__NetBSD__)
|
|
/* NetBSD */
|
|
/* opendisk() doesn't work for floppies. */
|
|
@@ -233,7 +285,7 @@
|
|
#elif defined(__FreeBSD__)
|
|
/* FreeBSD */
|
|
# if __FreeBSD__ >= 4
|
|
- sprintf (name, "/dev/rad%d", unit);
|
|
+ sprintf (name, "/dev/ad%d", unit);
|
|
# else /* __FreeBSD__ <= 3 */
|
|
sprintf (name, "/dev/rwd%d", unit);
|
|
# endif /* __FreeBSD__ <= 3 */
|
|
@@ -274,7 +326,11 @@
|
|
sprintf (name, "/dev/sd%d", unit);
|
|
#elif defined(__FreeBSD__)
|
|
/* FreeBSD */
|
|
+# if __FreeBSD__ >= 4
|
|
+ sprintf (name, "/dev/da%d", unit);
|
|
+# else /* __FreeBSD__ <= 3 */
|
|
sprintf (name, "/dev/rda%d", unit);
|
|
+# endif /* __FreeBSD__ <= 3 */
|
|
#elif defined(__NetBSD__) && defined(HAVE_OPENDISK)
|
|
/* NetBSD */
|
|
char shortname[16];
|