diff --git a/src/devices/cpu/jaguar/jagdasm.cpp b/src/devices/cpu/jaguar/jagdasm.cpp
index 97c049594d6..98cb8aafff5 100644
--- a/src/devices/cpu/jaguar/jagdasm.cpp
+++ b/src/devices/cpu/jaguar/jagdasm.cpp
@@ -113,12 +113,12 @@ offs_t jaguar_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
 		case 30:    util::stream_format(stream, "cmp     r%d,r%d", reg1, reg2);                 break;
 		case 31:    util::stream_format(stream, "cmpq    %s,r%d", signed_16bit((int16_t)(reg1 << 11) >> 11), reg2);break;
 
-		case 32:    if (m_variant == JAGUAR_VARIANT_GPU)
+		case 32:    if (m_variant == variant::GPU)
 					util::stream_format(stream, "sat8    r%d", reg2);
 					else
 					util::stream_format(stream, "subqmod $%x,r%d", convert_zero[reg1], reg2);
 					break;
-		case 33:    if (m_variant == JAGUAR_VARIANT_GPU)
+		case 33:    if (m_variant == variant::GPU)
 					util::stream_format(stream, "sat16   r%d", reg2);
 					else
 					util::stream_format(stream, "sat16s  r%d", reg2);
@@ -131,7 +131,7 @@ offs_t jaguar_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
 		case 39:    util::stream_format(stream, "loadb   (r%d),r%d", reg1, reg2);                   break;
 		case 40:    util::stream_format(stream, "loadw   (r%d),r%d", reg1, reg2);                   break;
 		case 41:    util::stream_format(stream, "load    (r%d),r%d", reg1, reg2);                   break;
-		case 42:    if (m_variant == JAGUAR_VARIANT_GPU)
+		case 42:    if (m_variant == variant::GPU)
 					util::stream_format(stream, "loadp   (r%d),r%d", reg1, reg2);
 					else
 					util::stream_format(stream, "sat32s  r%d", reg2);
@@ -141,7 +141,7 @@ offs_t jaguar_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
 		case 45:    util::stream_format(stream, "storeb  r%d,(r%d)", reg2, reg1);               break;
 		case 46:    util::stream_format(stream, "storew  r%d,(r%d)", reg2, reg1);               break;
 		case 47:    util::stream_format(stream, "store   r%d,(r%d)", reg2, reg1);                   break;
-		case 48:    if (m_variant == JAGUAR_VARIANT_GPU)
+		case 48:    if (m_variant == variant::GPU)
 					util::stream_format(stream, "storep  r%d,(r%d)", reg2, reg1);
 					else
 					util::stream_format(stream, "mirror  r%d", reg2);
@@ -159,12 +159,12 @@ offs_t jaguar_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
 		case 59:    util::stream_format(stream, "load    (r15+r%d),r%d", reg1, reg2);               break;
 		case 60:    util::stream_format(stream, "store   r%d,(r14+r%d)", reg2, reg1);               break;
 		case 61:    util::stream_format(stream, "store   r%d,(r15+r%d)", reg2, reg1);               break;
-		case 62:    if (m_variant == JAGUAR_VARIANT_GPU)
+		case 62:    if (m_variant == variant::GPU)
 					util::stream_format(stream, "sat24   r%d", reg2);
 					else
 					util::stream_format(stream, "illegal");
 					break;
-		case 63:    if (m_variant == JAGUAR_VARIANT_GPU)
+		case 63:    if (m_variant == variant::GPU)
 					util::stream_format(stream, reg1 ?
 									"unpack  r%d" :
 									"pack    r%d", reg2);
@@ -176,7 +176,7 @@ offs_t jaguar_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
 	return size | flags | SUPPORTED;
 }
 
-jaguar_disassembler::jaguar_disassembler(u32 variant) : m_variant(variant)
+jaguar_disassembler::jaguar_disassembler(variant vari) : m_variant(var)
 {
 }
 
diff --git a/src/devices/cpu/jaguar/jagdasm.h b/src/devices/cpu/jaguar/jagdasm.h
index 232fda13b1f..53b519a8943 100644
--- a/src/devices/cpu/jaguar/jagdasm.h
+++ b/src/devices/cpu/jaguar/jagdasm.h
@@ -16,10 +16,13 @@
 class jaguar_disassembler : public util::disasm_interface
 {
 public:
-	static constexpr unsigned JAGUAR_VARIANT_GPU = 0;
-	static constexpr unsigned JAGUAR_VARIANT_DSP = 1;
+	enum class variant
+	{
+		GPU = 0,
+		DSP = 1
+	};
 
-	jaguar_disassembler(u32 variant);
+	jaguar_disassembler(variant var);
 	virtual ~jaguar_disassembler() = default;
 
 	virtual u32 opcode_alignment() const override;
@@ -29,9 +32,9 @@ private:
 	static const uint8_t convert_zero[32];
 	static const char *const condition[32];
 
-	u32 m_variant;
+	const variant m_variant;
 
 	static std::string signed_16bit(int16_t val);
 };
 
-#endif
+#endif // MAME_CPU_JAGUAR_JAGDASM_H
diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp
index efa797a954a..7b016dce40b 100644
--- a/src/devices/cpu/jaguar/jaguar.cpp
+++ b/src/devices/cpu/jaguar/jaguar.cpp
@@ -1440,10 +1440,10 @@ WRITE32_MEMBER( jaguardsp_cpu_device::ctrl_w )
 
 std::unique_ptr<util::disasm_interface> jaguargpu_cpu_device::create_disassembler()
 {
-	return std::make_unique<jaguar_disassembler>(jaguar_disassembler::JAGUAR_VARIANT_GPU);
+	return std::make_unique<jaguar_disassembler>(jaguar_disassembler::variant::GPU);
 }
 
 std::unique_ptr<util::disasm_interface> jaguardsp_cpu_device::create_disassembler()
 {
-	return std::make_unique<jaguar_disassembler>(jaguar_disassembler::JAGUAR_VARIANT_DSP);
+	return std::make_unique<jaguar_disassembler>(jaguar_disassembler::variant::DSP);
 }