diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index facabbe2ecd..489c3026537 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -9203,31 +9203,31 @@ atapm_proc_resp(struct cam_device *device, union ccb *ccb)
 
 	printf("%s%d: ", device->device_name, device->dev_unit_num);
 	switch (count) {
-	case 0x00:
+	case ATA_PM_STANDBY:
 		printf("Standby mode\n");
 		break;
-	case 0x01:
+	case ATA_PM_STANDBY_Y:
 		printf("Standby_y mode\n");
 		break;
-	case 0x40:
+	case 0x40:	/* obsolete since ACS-3 */
 		printf("NV Cache Power Mode and the spindle is spun down or spinning down\n");
 		break;
-	case 0x41:
+	case 0x41:	/* obsolete since ACS-3 */
 		printf("NV Cache Power Mode and the spindle is spun up or spinning up\n");
 		break;
-	case 0x80:
+	case ATA_PM_IDLE:
 		printf("Idle mode\n");
 		break;
-	case 0x81:
+	case ATA_PM_IDLE_A:
 		printf("Idle_a mode\n");
 		break;
-	case 0x82:
+	case ATA_PM_IDLE_B:
 		printf("Idle_b mode\n");
 		break;
-	case 0x83:
+	case ATA_PM_IDLE_C:
 		printf("Idle_c mode\n");
 		break;
-	case 0xff:
+	case ATA_PM_ACTIVE_IDLE:
 		printf("Active or Idle mode\n");
 		break;
 	default:
diff --git a/sbin/camcontrol/epc.c b/sbin/camcontrol/epc.c
index f96ca6e68ba..aac94ccaa4e 100644
--- a/sbin/camcontrol/epc.c
+++ b/sbin/camcontrol/epc.c
@@ -475,18 +475,18 @@ check_power_mode:
 	 || (ident->enabled2 & ATA_ENABLED_EPC)) {
 		if (mode_name != NULL)
 			printf("%s", mode_name);
-		else if (count == 0xff) {
+		else if (count == ATA_PM_ACTIVE_IDLE) {
 			printf("PM0:Active or PM1:Idle");
 		}
 	} else {
 		switch (count) {
-		case 0x00:
+		case ATA_PM_STANDBY:
 			printf("PM2:Standby");
 			break;
-		case 0x80:
+		case ATA_PM_IDLE:
 			printf("PM1:Idle");
 			break;
-		case 0xff:
+		case ATA_PM_ACTIVE_IDLE:
 			printf("PM0:Active or PM1:Idle");
 			break;
 		}
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 26d0d96d026..41561c25f36 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -3660,8 +3660,8 @@ adaspindown(uint8_t cmd, int flags)
 				}
 #endif
 				switch (mode) {
-				case 0x00:
-				case 0x01:
+				case ATA_PM_STANDBY:
+				case ATA_PM_STANDBY_Y:
 					if (bootverbose) {
 						xpt_print(periph->path,
 						    "already spun down\n");
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index 7f89d96790f..2cebba0e486 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
@@ -477,6 +477,13 @@ struct ata_params {
 #define ATA_READ_BUFFER                 0xe4    /* read buffer */
 #define ATA_READ_PM                     0xe4    /* read portmultiplier */
 #define ATA_CHECK_POWER_MODE            0xe5    /* device power mode */
+#define		ATA_PM_STANDBY		0x00	/* standby, also ATA_EPC_STANDBY_Z */
+#define		ATA_PM_STANDBY_Y	0x01	/* standby, also ATA_EPC_STANDBY_Y */
+#define		ATA_PM_IDLE		0x80	/* idle */
+#define		ATA_PM_IDLE_A		0x81	/* idle, also ATA_EPC_IDLE_A */
+#define		ATA_PM_IDLE_B		0x82	/* idle, also ATA_EPC_IDLE_B */
+#define		ATA_PM_IDLE_C		0x83	/* idle, also ATA_EPC_IDLE_C */
+#define		ATA_PM_ACTIVE_IDLE	0xff	/* active or idle */
 #define ATA_SLEEP                       0xe6    /* sleep */
 #define ATA_FLUSHCACHE                  0xe7    /* flush cache to disk */
 #define	ATA_WRITE_BUFFER		0xe8    /* write buffer */