use MR_DCMD consistently. some MD_DCMD was in there somehow.

2 files changed, 11 insertions, 11 deletions

diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index e2e86392d5d..66fc4c5fecf 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.139 2013/04/07 02:32:03 dlg Exp $ */
+/* $OpenBSD: mfi.c,v 1.140 2013/04/30 07:17:36 dlg Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -1468,7 +1468,7 @@ mfi_bio_getitall(struct mfi_softc *sc)
 	cfg = malloc(sizeof *cfg, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cfg == NULL)
 		goto done;
-	if (mfi_mgmt(sc, MD_DCMD_CONF_GET, MFI_DATA_IN, sizeof *cfg, cfg,
+	if (mfi_mgmt(sc, MR_DCMD_CONF_GET, MFI_DATA_IN, sizeof *cfg, cfg,
 	    NULL))
 		goto done;
 
@@ -1479,7 +1479,7 @@ mfi_bio_getitall(struct mfi_softc *sc)
 	cfg = malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (cfg == NULL)
 		goto done;
-	if (mfi_mgmt(sc, MD_DCMD_CONF_GET, MFI_DATA_IN, size, cfg, NULL))
+	if (mfi_mgmt(sc, MR_DCMD_CONF_GET, MFI_DATA_IN, size, cfg, NULL))
 		goto done;
 
 	/* replace current pointer with enw one */
@@ -1912,7 +1912,7 @@ mfi_ioctl_setstate(struct mfi_softc *sc, struct bioc_setstate *bs)
 	}
 
 
-	if (mfi_mgmt(sc, MD_DCMD_PD_SET_STATE, MFI_DATA_NONE, 0, NULL, mbox))
+	if (mfi_mgmt(sc, MR_DCMD_PD_SET_STATE, MFI_DATA_NONE, 0, NULL, mbox))
 		goto done;
 
 	rv = 0;
@@ -1944,7 +1944,7 @@ mfi_bio_hs(struct mfi_softc *sc, int volid, int type, void *bio_hs)
 
 	/* send single element command to retrieve size for full structure */
 	cfg = malloc(sizeof *cfg, M_DEVBUF, M_WAITOK);
-	if (mfi_mgmt(sc, MD_DCMD_CONF_GET, MFI_DATA_IN, sizeof *cfg, cfg, NULL))
+	if (mfi_mgmt(sc, MR_DCMD_CONF_GET, MFI_DATA_IN, sizeof *cfg, cfg, NULL))
 		goto freeme;
 
 	size = cfg->mfc_size;
@@ -1952,7 +1952,7 @@ mfi_bio_hs(struct mfi_softc *sc, int volid, int type, void *bio_hs)
 
 	/* memory for read config */
 	cfg = malloc(size, M_DEVBUF, M_WAITOK|M_ZERO);
-	if (mfi_mgmt(sc, MD_DCMD_CONF_GET, MFI_DATA_IN, size, cfg, NULL))
+	if (mfi_mgmt(sc, MR_DCMD_CONF_GET, MFI_DATA_IN, size, cfg, NULL))
 		goto freeme;
 
 	/* calculate offset to hs structure */
diff --git a/sys/dev/ic/mfireg.h b/sys/dev/ic/mfireg.h
index b6966d9154e..90adf20d7a4 100644
--- a/sys/dev/ic/mfireg.h
+++ b/sys/dev/ic/mfireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfireg.h,v 1.34 2013/04/30 07:14:13 dlg Exp $ */
+/* $OpenBSD: mfireg.h,v 1.35 2013/04/30 07:17:36 dlg Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -110,15 +110,15 @@
 #define MR_DCMD_CTRL_EVENT_WAIT			0x01040500
 #define MR_DCMD_PD_GET_LIST			0x02010000
 #define MR_DCMD_PD_GET_INFO			0x02020000
-#define MD_DCMD_PD_SET_STATE			0x02030100
-#define MD_DCMD_PD_REBUILD			0x02040100
+#define MR_DCMD_PD_SET_STATE			0x02030100
+#define MR_DCMD_PD_REBUILD			0x02040100
 #define MR_DCMD_PD_BLINK			0x02070100
 #define MR_DCMD_PD_UNBLINK			0x02070200
 #define MR_DCMD_PD_GET_ALLOWED_OPS_LIST		0x020a0100
 #define MR_DCMD_LD_GET_LIST			0x03010000
 #define MR_DCMD_LD_GET_INFO			0x03020000
 #define MR_DCMD_LD_GET_PROPERTIES		0x03030000
-#define MD_DCMD_CONF_GET			0x04010000
+#define MR_DCMD_CONF_GET			0x04010000
 #define MR_DCMD_BBU_GET_STATUS			0x05010000
 #define MR_DCMD_BBU_GET_CAPACITY_INFO		0x05020000
 #define MR_DCMD_BBU_GET_DESIGN_INFO		0x05030000
@@ -921,7 +921,7 @@ struct mfi_pd_allowedops_list {
 	uint32_t		mpo_allowedops_list[MFI_MAX_PD];
 } __packed;
 
-/* array configuration from MD_DCMD_CONF_GET */
+/* array configuration from MR_DCMD_CONF_GET */
 struct mfi_array {
 	u_quad_t		mar_smallest_pd;
 	uint8_t			mar_no_disk;