diff --git a/regs/systembus_bits.csv b/regs/systembus_bits.csv index b77833b..5eea483 100644 --- a/regs/systembus_bits.csv +++ b/regs/systembus_bits.csv @@ -11,7 +11,7 @@ "ISTNRM",,"16","end_of_dma_ext_dma1","1",, "ISTNRM",,"15","end_of_dma_aica_dma","1",, "ISTNRM",,"14","end_of_dma_gd_dma","1",, -"ISTNRM",,"13","maple_v_blank_over_interrupt","1",, +"ISTNRM",,"13","maple_v_blank_over","1",, "ISTNRM",,"12","end_of_dma_maple_dma","1",, "ISTNRM",,"11","end_of_dma_pvr_dma","1",, "ISTNRM",,"10","end_of_transferring_translucent_modifier_volume_list","1",, @@ -19,9 +19,9 @@ "ISTNRM",,"8","end_of_transferring_opaque_modifier_volume_list","1",, "ISTNRM",,"7","end_of_transferring_opaque_list","1",, "ISTNRM",,"6","end_of_transferring_yuv","1",, -"ISTNRM",,"5","h_blank_in_interrupt","1",, -"ISTNRM",,"4","v_blank_out_interrupt","1",, -"ISTNRM",,"3","v_blank_in_interrupt","1",, +"ISTNRM",,"5","h_blank_in","1",, +"ISTNRM",,"4","v_blank_out","1",, +"ISTNRM",,"3","v_blank_in","1",, "ISTNRM",,"2","end_of_render_tsp","1",, "ISTNRM",,"1","end_of_render_isp","1",, "ISTNRM",,"0","end_of_render_video","1",, diff --git a/regs/systembus_bits.ods b/regs/systembus_bits.ods index b292af6..a0baeb0 100644 Binary files a/regs/systembus_bits.ods and b/regs/systembus_bits.ods differ diff --git a/systembus.hpp b/systembus.hpp index 0eb9117..e09184b 100644 --- a/systembus.hpp +++ b/systembus.hpp @@ -1,3 +1,5 @@ +#pragma once + #include #include diff --git a/systembus_bits.hpp b/systembus_bits.hpp index 37cc7fd..9438840 100644 --- a/systembus_bits.hpp +++ b/systembus_bits.hpp @@ -32,7 +32,7 @@ constexpr uint32_t end_of_dma_aica_dma = 1 << 15; constexpr uint32_t end_of_dma_gd_dma = 1 << 14; -constexpr uint32_t maple_v_blank_over_interrupt = 1 << 13; +constexpr uint32_t maple_v_blank_over = 1 << 13; constexpr uint32_t end_of_dma_maple_dma = 1 << 12; @@ -48,11 +48,11 @@ constexpr uint32_t end_of_transferring_opaque_list = 1 << 7; constexpr uint32_t end_of_transferring_yuv = 1 << 6; -constexpr uint32_t h_blank_in_interrupt = 1 << 5; +constexpr uint32_t h_blank_in = 1 << 5; -constexpr uint32_t v_blank_out_interrupt = 1 << 4; +constexpr uint32_t v_blank_out = 1 << 4; -constexpr uint32_t v_blank_in_interrupt = 1 << 3; +constexpr uint32_t v_blank_in = 1 << 3; constexpr uint32_t end_of_render_tsp = 1 << 2;