Author: nyan
Date: Mon Nov 3 10:27:03 2014
New Revision: 274025
URL: https://svnweb.freebsd.org/changeset/base/274025
Log:
MFC: r272248
- Cleanups pc98 code.
- Remove unworked formats.
Modified:
stable/9/sys/sys/fdcio.h
stable/9/usr.sbin/fdread/fdutil.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/sys/ (props changed)
stable/9/usr.sbin/fdread/ (props changed)
Modified: stable/9/sys/sys/fdcio.h
==============================================================================
--- stable/9/sys/sys/fdcio.h Mon Nov 3 10:26:29 2014 (r274024)
+++ stable/9/sys/sys/fdcio.h Mon Nov 3 10:27:03 2014 (r274025)
@@ -181,27 +181,17 @@ enum fd_drivetype {
* XXX: should have been done 20 years ago to make sense.
*/
#ifdef PC98
-#define FDF_3_1722 21,2,0xFF,0x04,82,0,2,2,0x0C,2,0,FL_MFM
-#define FDF_3_1476 18,2,0xFF,0x1B,82,0,2,2,0x54,1,0,FL_MFM
#define FDF_3_1440 18,2,0xFF,0x1B,80,0,2,2,0x54,1,0,FL_MFM
#define FDF_3_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_3_820 10,2,0xFF,0x10,82,0,1,2,0x30,1,0,FL_MFM
-#define FDF_3_800 10,2,0xFF,0x10,80,0,1,2,0x30,1,0,FL_MFM
#define FDF_3_720 9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_3_360 9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
#define FDF_3_640 8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_3_1230 8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_3_1280 8,3,0xFF,0x35,80,0,0,2,0x74,1,0,FL_MFM
-#define FDF_3_1480 9,3,0xFF,0x35,82,0,0,2,0x47,1,0,FL_MFM
-#define FDF_3_1640 10,3,0xFF,0x1B,82,0,2,2,0x54,1,0,FL_MFM
#define FDF_5_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_5_820 10,2,0xFF,0x10,82,0,1,2,0x30,1,0,FL_MFM
-#define FDF_5_800 10,2,0xFF,0x10,80,0,1,2,0x30,1,0,FL_MFM
#define FDF_5_720 9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_5_360 9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
#define FDF_5_640 8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
#define FDF_5_1230 8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_5_1280 8,3,0xFF,0x35,80,0,0,2,0x74,1,0,FL_MFM
#else /* PC98 */
#define FDF_3_2880 36,2,0xFF,0x1B,80,0,FDC_1MBPS,002,0x4C,1,1,FL_MFM|FL_PERPND
#define FDF_3_1722 21,2,0xFF,0x04,82,0,FDC_500KBPS,2,0x0C,2,0,FL_MFM
Modified: stable/9/usr.sbin/fdread/fdutil.c
==============================================================================
--- stable/9/usr.sbin/fdread/fdutil.c Mon Nov 3 10:26:29 2014
(r274024)
+++ stable/9/usr.sbin/fdread/fdutil.c Mon Nov 3 10:27:03 2014
(r274025)
@@ -92,6 +92,7 @@ static struct fd_type fd_types_auto[1] =
static struct fd_type fd_types_288m[] = {
+#ifndef PC98
#if 0
{ FDF_3_2880 },
#endif
@@ -102,30 +103,18 @@ static struct fd_type fd_types_288m[] =
{ FDF_3_820 },
{ FDF_3_800 },
{ FDF_3_720 },
+#endif /* !PC98 */
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
};
static struct fd_type fd_types_144m[] = {
#ifdef PC98
-#if 0
- { FDF_3_1722 },
- { FDF_3_1476 },
-#endif
{ FDF_3_1440 },
{ FDF_3_1200 },
-#if 0
- { FDF_3_820 },
- { FDF_3_800 },
-#endif
{ FDF_3_720 },
{ FDF_3_360 },
{ FDF_3_640 },
{ FDF_3_1230 },
-#if 0
- { FDF_3_1280 },
- { FDF_3_1480 },
- { FDF_3_1640 },
-#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
#else
{ FDF_3_1722 },
@@ -142,17 +131,10 @@ static struct fd_type fd_types_144m[] =
static struct fd_type fd_types_12m[] = {
#ifdef PC98
{ FDF_5_1200 },
-#if 0
- { FDF_5_820 },
- { FDF_5_800 },
-#endif
{ FDF_5_720 },
{ FDF_5_360 },
{ FDF_5_640 },
{ FDF_5_1230 },
-#if 0
- { FDF_5_1280 },
-#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
#else
{ FDF_5_1200 },
@@ -170,13 +152,17 @@ static struct fd_type fd_types_12m[] = {
static struct fd_type fd_types_720k[] =
{
+#ifndef PC98
{ FDF_3_720 },
+#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
};
static struct fd_type fd_types_360k[] =
{
+#ifndef PC98
{ FDF_5_360 },
+#endif
{ 0,0,0,0,0,0,0,0,0,0,0,0 }
};
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
