Updated driver to the 1.1.5 version:

date: 1994/05/22 12:35:38;  author: joerg;  state: Exp;  lines: +6 -6
First round of floppy changes. Try making `fd' more robust.

New features:
  .  ioctl command for setting the drive type (density etc.); restricted
     to the super-user
  .  ioctl for getting/seting `drive options'; currently only option
     is FDOPT_NORETRY: inhibit the usual retries; used when verifying
     a newly formatted track

Fixes:
  .  function prototypes
  .  made all internal functions `static'
  .  cleaned up & corrected .h files
  .  restructured, to make the chaotic function sequence more rational
  .  compiled with -Wall, and cleared all warnings
  .  introduced a mirror for the (write-only) `digital output register',
     to avoid the current kludge
  .  device probing completed by seeking/recalibrating, and looking
     for track 0 being found
  .  holding the controller down in reset state while it is idle (and
     thus saving allot of headaches)
  .  make requests fail that are not a multiple of the (physical)
     sector size
  .  removed the fixed physical sector size (512 bytes), allowing for any
     size the controller could handle (128/256/512/1024 bytes)
  .  replaced some silly messages
  .  fixed the TRACE* macro usage, debugging reports should be complete
     now again (debugging output is HUGE! though)
  .  removed fd_timeout for SEEK command; seeks are always reported by
     the controller to succeed, since the `success' only refers to the
     controller's idea of success - there is no hardware line to tell about
     the seek end (other than the `track 0' line)
  .  catch SENSEI's that report about a `terminated due to READY changed'
     status - could happen after a controller reset
  .  converted ``hz / <something>'' divide operations to divisors that are
     powers of two, so gcc can optimize them into shifts
  .  write/format operations are checked against a write-protected medium
     now *prior* starting the operation
  .  error reports of `invalid command' and `wrong cylinder' will cause
     shortcuts in the retrier() now
  .  fixed a bug in the retrier() causing bogus block numbers to be reported
  .  fdformat() does care for errors now

Known Bugs:
  .  no attempts have been made (yet) to improve the performance
  .  sometimes, bogus ``seek/recalib failed'' messages are logged; this
     is still a bug in the driver, but it's not harmful since it's
     usually caught by the retrier()

Reviewed by:
Submitted by:
Obtained from:

1 files changed, 68 insertions, 4 deletions

diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 1895db7..9f93b70 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: nec765.h,v 1.2 1993/10/16 13:48:50 rgrimes Exp $
  */
 
 /*
@@ -47,26 +47,90 @@
 #define NE7_RQM	0x80	/* Diskette Controller ReQuest for Master */
 
 /* Status register ST0 */
-#define NE7_ST0BITS	"\020\010invld\007abnrml\006seek_cmplt\005drv_chck\004drive_rdy\003top_head"
+#define NE7_ST0BITS	"\020\010invld\007abnrml\006seek_cmplt\005equ_chck\004drive_notrdy\003top_head"
+
+#define NE7_ST0_IC	0xc0	/* interrupt completion code */
+
+#define NE7_ST0_IC_RC	0xc0	/* terminated due to ready changed, n/a */
+#define NE7_ST0_IC_IV	0x80	/* invalid command; must reset FDC */
+#define NE7_ST0_IC_AT	0x40	/* abnormal termination, check error stat */
+#define NE7_ST0_IC_NT	0x00	/* normal termination */
+
+#define NE7_ST0_SE	0x20	/* seek end */
+#define NE7_ST0_EC	0x10	/* equipment check, recalibrated but no trk0 */
+#define NE7_ST0_NR	0x08	/* not ready (n/a) */
+#define NE7_ST0_HD	0x04	/* upper head selected */
+#define NE7_ST0_DR	0x03	/* drive code */
 
 /* Status register ST1 */
 #define NE7_ST1BITS	"\020\010end_of_cyl\006bad_crc\005data_overrun\003sec_not_fnd\002write_protect\001no_am"
 
+#define NE7_ST1_EN	0x80	/* end of cylinder, access past last record */
+#define NE7_ST1_DE	0x20	/* data error, CRC fail in ID or data */
+#define NE7_ST1_OR	0x10	/* DMA overrun, DMA failed to do i/o quickly */
+#define NE7_ST1_ND	0x04	/* no data, sector not found or CRC in ID f. */
+#define NE7_ST1_NW	0x02	/* not writeable, attempt to violate WP */
+#define NE7_ST1_MA	0x01	/* missing address mark (in ID or data field)*/
+
 /* Status register ST2 */
 #define NE7_ST2BITS	"\020\007ctrl_mrk\006bad_crc\005wrong_cyl\004scn_eq\003scn_not_fnd\002bad_cyl\001no_dam"
 
+#define NE7_ST2_CM	0x40	/* control mark; found deleted data */
+#define NE7_ST2_DD	0x20	/* data error in data field, CRC fail */
+#define NE7_ST2_WC	0x10	/* wrong cylinder, ID field mismatches cmd */
+#define NE7_ST2_SH	0x08	/* scan equal hit */
+#define NE7_ST2_SN	0x04	/* scan not satisfied */
+#define NE7_ST2_BC	0x02	/* bad cylinder, cylinder marked 0xff */
+#define NE7_ST2_MD	0x01	/* missing address mark in data field */
+
 /* Status register ST3 */
 #define NE7_ST3BITS	"\020\010fault\007write_protect\006drdy\005tk0\004two_side\003side_sel\002"
 
+#define NE7_ST3_FT	0x80	/* fault; PC: n/a */
+#define NE7_ST3_WP	0x40	/* write protected */
+#define NE7_ST3_RD	0x20	/* ready; PC: always true */
+#define NE7_ST3_T0	0x10	/* track 0 */
+#define NE7_ST3_TS	0x08	/* two-sided; PC: n/a */
+#define NE7_ST3_HD	0x04	/* upper head select */
+#define NE7_ST3_US	0x03	/* unit select */
+
 /* Commands */
+/*
+ * the top three bits -- where appropriate -- are set as follows:
+ *
+ * 0x80 - MT  multi-track; allow both sides to be handled in single cmd
+ * 0x40 - MFM modified frequency modulation; use MFM encoding
+ * 0x20 - SK  skip; skip sectors marked as "deleted"
+ */
+#define NE7CMD_READTRK	0x42	/*  read whole track */
 #define NE7CMD_SPECIFY	3	/*  specify drive parameters - requires unit
 					parameters byte */
 #define NE7CMD_SENSED	4	/*  sense drive - requires unit select byte */
 #define NE7CMD_WRITE	0xc5	/*  write - requires eight additional bytes */
 #define NE7CMD_READ	0xe6	/*  read - requires eight additional bytes */
-#define NE7CMD_FORMAT	0x4c	/*  format - requires five additional bytes */
 #define NE7CMD_RECAL	7	/*  recalibrate drive - requires
 					unit select byte */
 #define NE7CMD_SENSEI	8	/*  sense controller interrupt status */
-#define NE7CMD_SEEK	15	/*  seek drive - requires unit select byte
+#define NE7CMD_WRITEDEL	0xc9	/*  write deleted data */
+#define NE7CMD_READID	0x4a	/*  read ID field */
+#define NE7CMD_READDEL	0xec	/*  read deleted data */
+#define NE7CMD_FORMAT	0x4d	/*  format - requires five additional bytes */
+#define NE7CMD_SEEK	0x0f	/*  seek drive - requires unit select byte
 					and new cyl byte */
+#define NE7CMD_SCNEQU	0xf1	/*  scan equal */
+#define NE7CMD_SCNLE	0xf9	/*  scan less or equal */
+#define NE7CMD_SCNGE	0xfd	/*  scan greater or equal */
+
+
+/*
+ * "specify" definitions
+ *
+ * acronyms (times are relative to a FDC clock of 8 MHz):
+ * srt - step rate; PC usually 3 ms
+ * hut - head unload time; PC usually maximum of 240 ms
+ * hlt - head load time; PC usually minimum of 2 ms
+ * nd  - no DMA flag; PC usually not set (0)
+ */
+
+#define NE7_SPEC_1(srt, hut) (((16 - (srt)) << 4) | (((hut) / 16)))
+#define NE7_SPEC_2(hlt, nd)  (((hlt) & 0xFE) | ((nd) & 1))