diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 9cf83525773..0ee2deb8905 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -521,7 +521,7 @@ fdc_reset(struct fdc_data *fdc)
 
 	if (fdc->fdct == FDC_ENHANCED) {
 		if (fdc_cmd(fdc, 4,
-		    I8207X_CONFIGURE,
+		    I8207X_CONFIG,
 		    0,
 		    0x40 |			/* Enable Implied Seek */
 		    0x10 |			/* Polling disabled */
@@ -532,7 +532,7 @@ fdc_reset(struct fdc_data *fdc)
 			    " CONFIGURE failed in reset\n");
 		if (debugflags & 1) {
 			if (fdc_cmd(fdc, 1,
-			    0x0e,			/* DUMPREG */
+			    I8207X_DUMPREG,
 			    10, &r[0], &r[1], &r[2], &r[3], &r[4],
 			    &r[5], &r[6], &r[7], &r[8], &r[9]))
 				device_printf(fdc->fdc_dev,
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 98516859933..62ad0cdc5b9 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -35,12 +35,12 @@
  */
 
 /* Main status register */
-#define NE7_DAB	0x01	/* Diskette drive A is seeking, thus busy */
-#define NE7_DBB	0x02	/* Diskette drive B is seeking, thus busy */
-#define NE7_CB	0x10	/* Diskette Controller Busy */
-#define NE7_NDM	0x20	/* Diskette Controller in Non Dma Mode */
-#define NE7_DIO	0x40	/* Diskette Controller Data register I/O */
-#define NE7_RQM	0x80	/* Diskette Controller ReQuest for Master */
+#define NE7_DAB		0x01	/* Diskette drive A is seeking, thus busy */
+#define NE7_DBB		0x02	/* Diskette drive B is seeking, thus busy */
+#define NE7_CB		0x10	/* Diskette Controller Busy */
+#define NE7_NDM		0x20	/* Diskette Controller in Non Dma Mode */
+#define NE7_DIO		0x40	/* Diskette Controller Data register I/O */
+#define NE7_RQM		0x80	/* Diskette Controller ReQuest for Master */
 
 /* Status register ST0 */
 #define NE7_ST0BITS	"\020\010invld\007abnrml\006seek_cmplt\005equ_chck\004drive_notrdy\003top_head"
@@ -109,21 +109,22 @@
 #define NE7CMD_MFM	0x40	/* same as MT, plus READTRK, READID, FORMAT */
 #define NE7CMD_SK	0x20	/* READ, READDEL, SCAN* */
 
-#define NE7CMD_READTRK	2	/*  read whole track */
-#define NE7CMD_SPECIFY	3	/*  specify drive parameters - requires unit
+#define NE7CMD_READTRK	0x02	/*  read whole track */
+#define NE7CMD_SPECIFY	0x03	/*  specify drive parameters - requires unit
 				 *  parameters byte */
-#define NE7CMD_SENSED	4	/*  sense drive - requires unit select byte */
-#define NE7CMD_WRITE	5	/*  write - requires eight additional bytes */
-#define NE7CMD_READ	6	/*  read - requires eight additional bytes */
-#define NE7CMD_RECAL	7	/*  recalibrate drive - requires
+#define NE7CMD_SENSED	0x04	/*  sense drive - requires unit select byte */
+#define NE7CMD_WRITE	0x05	/*  write - requires eight additional bytes */
+#define NE7CMD_READ	0x06	/*  read - requires eight additional bytes */
+#define NE7CMD_RECAL	0x07	/*  recalibrate drive - requires
 				 *  unit select byte */
-#define NE7CMD_SENSEI	8	/*  sense controller interrupt status */
-#define NE7CMD_WRITEDEL	9	/*  write deleted data */
-#define NE7CMD_READID	0xa	/*  read ID field */
-#define NE7CMD_READDEL	0xc	/*  read deleted data */
-#define NE7CMD_FORMAT	0xd	/*  format - requires five additional bytes */
-#define NE7CMD_SEEK	0xf	/*  seek drive - requires unit select byte
+#define NE7CMD_SENSEI	0x08	/*  sense controller interrupt status */
+#define NE7CMD_WRITEDEL	0x09	/*  write deleted data */
+#define NE7CMD_READID	0x0a	/*  read ID field */
+#define NE7CMD_READDEL	0x0c	/*  read deleted data */
+#define NE7CMD_FORMAT	0x0d	/*  format - requires five additional bytes */
+#define NE7CMD_SEEK	0x0f	/*  seek drive - requires unit select byte
 				 *  and new cyl byte */
+#define NE7CMD_VERSION	0x10	/*  get version */
 #define NE7CMD_SCNEQU	0x11	/*  scan equal */
 #define NE7CMD_SCNLE	0x19	/*  scan less or equal */
 #define NE7CMD_SCNGE	0x1d	/*  scan greater or equal */
@@ -131,9 +132,8 @@
 /*
  * Enhanced controller commands:
  */
-#define NE7CMD_VERSION	0x10	/*  version (ok for all controllers) */
-
-#define I8207X_CONFIGURE 0x13   /*  configure enhanced features */
+#define I8207X_DUMPREG	0x0e	/*  dump internal registers */
+#define I8207X_CONFIG	0x13	/*  configure enhanced features */
 
 /*
  * "specify" definitions
@@ -145,5 +145,5 @@
  * 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))
+#define NE7_SPEC_1(srt, hut)	(((16 - (srt)) << 4) | (((hut) / 16)))
+#define NE7_SPEC_2(hlt, nd)	(((hlt) & 0xFE) | ((nd) & 1))
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 529486bf354..b8c2827dae0 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -475,7 +475,7 @@ enable_fifo(fdc_p fdc)
 		 * first byte, and check for an early turn of data directon.
 		 */
 		
-		if (out_fdc(fdc, I8207X_CONFIGURE) < 0)
+		if (out_fdc(fdc, I8207X_CONFIG) < 0)
 			return fdc_err(fdc, "Enable FIFO failed\n");
 		
 		/* If command is invalid, return */
@@ -498,7 +498,7 @@ enable_fifo(fdc_p fdc)
 		return 0;
 	}
 	if (fd_cmd(fdc, 4,
-		   I8207X_CONFIGURE, 0, (fifo_threshold - 1) & 0xf, 0, 0) < 0)
+		   I8207X_CONFIG, 0, (fifo_threshold - 1) & 0xf, 0, 0) < 0)
 		return fdc_err(fdc, "Re-enable FIFO failed\n");
 	return 0;
 }