diff --git a/build/buildsetup/ioreg_sp/io_register_list.csv b/build/buildsetup/ioreg_sp/io_register_list.csv
index 66d5cc9..d42aa0c 100644
--- a/build/buildsetup/ioreg_sp/io_register_list.csv
+++ b/build/buildsetup/ioreg_sp/io_register_list.csv
@@ -1,19 +1,19 @@
-#offset,condition,name,bit,rw,category,volatile/permanent,fieldname,shift,bit,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-#システム設定 twl p117,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4000,,A9ROM,8,rw,CFG,volatile,FUSE,2,1,NTR,1,1,SEC,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4001,,A7ROM,8,rw,CFG,volatile,NTR,1,1,SEC,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4002,,DEVROM,8,rw,CFG,volatile,WE,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4004,,CLK,16,rw,CFG,volatile,SND,8,1,WRAM,7,1,AES,2,1,WSD,1,0,SD,0,1,,,,,,,,,,,,,,,,,,,,,,,,
-0x4006,,CPU_JTAG,8,rw,CFG,volatile,E,1,1,A7,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4007,,DSP_JTAG,8,rw,CFG,volatile,E,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4008,,DS_MDFY,8,rw,CFG,volatile,MC,7,1,SND,2,1,SDMA,1,1,DMA,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4009,,DS_EX,8,rw,CFG,volatile,MAIM_MEM,6,2,VRAM,5,1,LCDC,4,1,SIO,3,1,SDMA2,2,1,SPI,1,1,INTC,0,1,,,,,,,,,,,,,,,,,,
-0x400a,,TWL_EX,16,rw,CFG,volatile,CFG_E,15,1,WSD_PU,13,1,SD_PU,12,1,WRAM,9,0,MC_B,8,1,GPIO,7,1,I2C,6,1,I2S,5,1,MIC,4,1,WSD,3,1,SD,2,1,AES,1,1,DMA4,0,1
-0x4020,,DSWL_MAC,8,rw,CFG,volatile,E,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4024,,BONDING,8,rw,CFG,volatile,CHIP_TYPE,0,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-#twl p125,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4010,,MC_DET,8,rw,MI,volatile,MODE2,6,2,DET2,4,1,MODE1,2,2,DET1,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4011,,MC_SWP,8,rw,MI,volatile,SWP,7,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+#offset,condition,name,bit,rw,category,volatile/permanent,fieldname,shift,bit,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+#システム設定 twl p117,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4000,,A9ROM,8,rw,CFG,volatile,FUSE,2,1,NTR,1,1,SEC,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4001,,A7ROM,8,rw,CFG,volatile,NTR,1,1,SEC,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4002,,DEVROM,8,rw,CFG,volatile,WE,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4004,,CLK,16,rw,CFG,volatile,SND,8,1,WRAM,7,1,AES,2,1,WSD,1,0,SD,0,1,,,,,,,,,,,,,,,,,,,,,
+0x4006,,CPU_JTAG,8,rw,CFG,volatile,E,1,1,A7,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4007,,DSP_JTAG,8,rw,CFG,volatile,E,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4008,,DS_MDFY,8,rw,CFG,volatile,MC,7,1,SND,2,1,SDMA,1,1,DMA,0,1,,,,,,,,,,,,,,,,,,,,,,,,
+0x4009,,DS_EX,8,rw,CFG,volatile,MAIM_MEM,6,2,VRAM,5,1,LCDC,4,1,SIO,3,1,SDMA2,2,1,SPI,1,1,INTC,0,1,,,,,,,,,,,,,,,
+0x400a,,TWL_EX,16,rw,CFG,volatile,CFG_E,15,1,SD_PU,12,1,WRAM,9,0,MC_B,8,1,GPIO,7,1,I2C,6,1,I2S,5,1,MIC,4,1,WSD,3,1,SD,2,1,AES,1,1,DMA4,0,1
+0x4020,,DSWL_MAC,8,rw,CFG,volatile,E,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4024,,BONDING,8,rw,CFG,volatile,CHIP_TYPE,0,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+#twl p125,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4010,,MC_DET,8,rw,MI,volatile,MODE2,6,2,DET2,4,1,MODE1,2,2,DET1,0,1,,,,,,,,,,,,,,,,,,,,,,,,
+0x4011,,MC_SWP,8,rw,MI,volatile,SWP,7,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x4012,,MC_CHT,16,rw,MI,volatile,,,,,,,,,
 0x4040,,WRAM_A0,8,rw,MI,volatile,E,7,1,OFS,2,2,MST,0,1
 0x4041,,WRAM_A1,8,rw,MI,volatile,E,7,1,OFS,2,2,MST,0,1
@@ -62,38 +62,39 @@
 0x44e0,,AES_ID3,128,rw,AES,volatile
 0x44f0,,AES_SEED3,128,rw,AES,volatile
 #FUSE twl p176 〜 p178,,,,,,
-0x4D00,,FUSE_ID0,32,rw,MI,volatile,WAFER,24,8,X,12,12,Y,0,12,,,,,,,,,,,,,,,,,,,,,
-0x4D04,,FUSE_ID1,32,rw,MI,volatile,FAB,20,9,LOT,0,20,,,,,,,,,,,,,,,,,,,,,,,,
-#GPIO2 twl p214 〜 p218,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4C00,,GPIO2DATA,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1,,,,,,,,,
-0x4C01,,GPIO2DIR,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1,,,,,,,,,
-0x4C02,,GPIO2EDGE,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1,,,,,,,,,
-0x4C03,,GPIO2IE,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1,,,,,,,,,
-0x4C04,,GPIO2CNT2,8,rw,EXI,volatile,WLRST,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4C05,,GPIO2CNT3,8,rw,EXI,volatile,VIBO,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
-#I2C twl p193 〜 p199,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4500,,I2CD,8,rw,EXI,volatile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4501,,I2CCNT,8,rw,EXI,volatile,E,7,1,I,6,1,RW,5,1,ACK,4,1,NT,2,1,START,1,1,STOP,0,1,,,,,,,,,
-#I2S twl p208 〜 p213,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x4700,,I2SCNT,8,rw,SND,volatile,E,15,1,MUTE,14,1,CODEC_SMP,13,1,MIX_RATIO,0,4,,,,,,,,,,,,,,,,,,
-#MIC twl p200 〜 p203,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4D00,,FUSE_ID0,32,rw,MI,volatile,WAFER,24,8,X,12,12,Y,0,12,,,,,,,,,,,,
+0x4D04,,FUSE_ID1,32,rw,MI,volatile,FAB,20,9,LOT,0,20,,,,,,,,,,,,,,,
+0x4D08,,FUSE_VERIFY,8,rw,MI,volatile,ERR,0,1,,,,,,,,,,,,,,,,,,
+#GPIO2 twl p214 〜 p218,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4C00,,GPIO2DATA,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1
+0x4C01,,GPIO2DIR,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1
+0x4C02,,GPIO2EDGE,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1
+0x4C03,,GPIO2IE,8,rw,EXI,volatile,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1
+0x4C04,,GPIO2CNT2,8,rw,EXI,volatile,WLRST,0,1,,,,,,,,,,,,,,,,,,
+0x4C05,,GPIO2CNT3,8,rw,EXI,volatile,VIBO,0,1,,,,,,,,,,,,,,,,,,
+#I2C twl p193 〜 p199,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4500,,I2CD,8,rw,EXI,volatile,,,,,,,,,,,,,,,,,,,,,
+0x4501,,I2CCNT,8,rw,EXI,volatile,E,7,1,I,6,1,RW,5,1,ACK,4,1,NT,2,1,START,1,1,STOP,0,1
+#I2S twl p208 〜 p213,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x4700,,I2SCNT,8,rw,SND,volatile,E,15,1,MUTE,14,1,CODEC_SMP,13,1,MIX_RATIO,0,4,,,,,,,,,
+#MIC twl p200 〜 p203,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x4600,,MICCNT,8,rw,SND,volatile,E,15,1,IM,13,2,FIFO_CLR,12,1,FIFO_ERR,11,1,FIFO_FUL,10,1,FIFO_HALF,9,1,FIFO_EMP,8,1,FIFO_SMP,2,2,NR,1,1,NL,0,1
-0x4604,,MIC_FIFO,32,rw,SND,volatile,,,,,,,,,,,,,,,,,,,,,,,,
-#表示ステータス nitro p215 / twl p222,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x004,,DISPSTAT,16,rw,GX,volatile,VCOUNTER,7,9,LD_INI,6,1,VQI,5,1,HBI,4,1,VBI,3,1,LYC,2,1,HBLK,1,1,VBLK,0,1
-0x006,,VCOUNT,16,rw,GX,volatile,VCOUNTER,0,10,,,,,,,,,,,,,,,,,,,,,
-#DMA nitro p210 〜 p212,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x0b0,,DMA0SAD,32,rw,MI,volatile,DMASRC,0,27,,,,,,,,,,,,,,,,,,,,,
-0x0b4,,DMA0DAD,32,rw,MI,volatile,DMADEST,0,27,,,,,,,,,,,,,,,,,,,,,
-0x0b8,,DMA0CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16
-0x0bc,,DMA1SAD,32,rw,MI,volatile,DMASRC,0,28,,,,,,,,,,,,,,,,,,,,,
-0x0c0,,DMA1DAD,32,rw,MI,volatile,DMADEST,0,27,,,,,,,,,,,,,,,,,,,,,
-0x0c4,,DMA1CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16
-0x0c8,,DMA2SAD,32,rw,MI,volatile,DMASRC,0,28,,,,,,,,,,,,,,,,,,,,,
-0x0cc,,DMA2DAD,32,rw,MI,volatile,DMADEST,0,27,,,,,,,,,,,,,,,,,,,,,
-0x0d0,,DMA2CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16
-0x0d4,,DMA3SAD,32,rw,MI,volatile,DMASRC,0,28,,,,,,,,,,,,,,,,,,,,,
-0x0d8,,DMA3DAD,32,rw,MI,volatile,DMADEST,0,28,,,,,,,,,,,,,,,,,,,,,
+0x4604,,MIC_FIFO,32,rw,SND,volatile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+#表示ステータス nitro p215 / twl p222,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x004,,DISPSTAT,16,rw,GX,volatile,VCOUNTER,7,9,LD_INI,6,1,VQI,5,1,HBI,4,1,VBI,3,1,LYC,2,1,HBLK,1,1,VBLK,0,1,,,,,,
+0x006,,VCOUNT,16,rw,GX,volatile,VCOUNTER,0,10,,,,,,,,,,,,,,,,,,,,,,,,,,,
+#DMA nitro p210 〜 p212,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0b0,,DMA0SAD,32,rw,MI,volatile,DMASRC,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0b4,,DMA0DAD,32,rw,MI,volatile,DMADEST,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0b8,,DMA0CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16,,,,,,
+0x0bc,,DMA1SAD,32,rw,MI,volatile,DMASRC,0,28,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0c0,,DMA1DAD,32,rw,MI,volatile,DMADEST,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0c4,,DMA1CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16,,,,,,
+0x0c8,,DMA2SAD,32,rw,MI,volatile,DMASRC,0,28,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0cc,,DMA2DAD,32,rw,MI,volatile,DMADEST,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0d0,,DMA2CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16,,,,,,
+0x0d4,,DMA3SAD,32,rw,MI,volatile,DMASRC,0,28,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x0d8,,DMA3DAD,32,rw,MI,volatile,DMADEST,0,28,,,,,,,,,,,,,,,,,,,,,,,,
 0x0dc,,DMA3CNT,32,rw,MI,volatile,E,31,1,I,30,1,TIMING,28,2,SB,26,1,CM,25,1,SAR,23,2,DAR,21,2,WORDCNT,0,16,,,
 # twl p150 〜 p163,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x4100,,DMAGBL,32,rw,MI,volatile,ARB,31,1,YLD,16,4,,,,,,,,,,,,,,,,,,,,,
@@ -125,23 +126,23 @@
 0x4168,,DMA7BCNT,32,rw,MI,volatile,PS,16,2,BI,0,16,,,,,,,,,,,,,,,,,,,,,
 0x416c,,DMA7FDATA,32,rw,MI,volatile,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x4170,,DMA7CNT,32,rw,MI,volatile,E,31,1,I,30,1,CM,29,1,TIMING,24,5,BSIZE,16,4,SRLD,15,1,SAR,13,2,DRLD,12,1,DAR,10,2
-#タイマ nitro p213,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x100,,TM0CNT_L,16,rw,OS,volatile,TIMER0CNT,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x102,,TM0CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,PS,0,2,,,,,,,,,,,,,,,,,,
-0x104,,TM1CNT_L,16,rw,OS,volatile,TIMER1CNT,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x106,,TM1CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,CH,2,1,PS,0,2,,,,,,,,,,,,,,,
-0x108,,TM2CNT_L,16,rw,OS,volatile,TIMER2CNT,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x10a,,TM2CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,CH,2,1,PS,0,2,,,,,,,,,,,,,,,
-0x10c,,TM3CNT_L,16,rw,OS,volatile,TIMER2CNT,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x10e,,TM3CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,CH,2,1,PS,0,2,,,,,,,,,,,,,,,
-#SIO ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-"#レジスタ0x128,0x12aは状況でビットの意味が大きく変わるので多重に定義してあります。",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x120,,SIODATA32,32,rw,EXI,volatile,H,16,16,L,0,16,,,,,,,,,,,,,,,,,,,,,
-0x120,,SIOMULTI0,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x122,,SIOMULTI1,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x124,,SIOMULTI2,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x126,,SIOMULTI3,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,,,,,,,,,,,,,,,,
-0x128,,SIOCNT,16,rw,EXI,volatile,CKUP,15,1,I,14,1,MD1,13,1,BITLEN,12,1,START,7,1,TSEND,3,1,TRECV,2,1,SCLOCKHZ,1,1,SCLOCK,0,1
+#タイマ nitro p213,,,,,,,,,,,,,,,,,,
+0x100,,TM0CNT_L,16,rw,OS,volatile,TIMER0CNT,0,16,,,,,,,,,
+0x102,,TM0CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,PS,0,2,,,
+0x104,,TM1CNT_L,16,rw,OS,volatile,TIMER1CNT,0,16,,,,,,,,,
+0x106,,TM1CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,CH,2,1,PS,0,2
+0x108,,TM2CNT_L,16,rw,OS,volatile,TIMER2CNT,0,16,,,,,,,,,
+0x10a,,TM2CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,CH,2,1,PS,0,2
+0x10c,,TM3CNT_L,16,rw,OS,volatile,TIMER2CNT,0,16,,,,,,,,,
+0x10e,,TM3CNT_H,16,rw,OS,volatile,E,7,1,I,6,1,CH,2,1,PS,0,2
+#SIO ,,,,,,,,,,,,,,,,,,
+"#レジスタ0x128,0x12aは状況でビットの意味が大きく変わるので多重に定義してあります。",,,,,,,,,,,,,,,,,,
+0x120,,SIODATA32,32,rw,EXI,volatile,H,16,16,L,0,16,,,,,,
+0x120,,SIOMULTI0,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,
+0x122,,SIOMULTI1,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,
+0x124,,SIOMULTI2,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,
+0x126,,SIOMULTI3,16,rw,EXI,volatile,DATA,0,16,,,,,,,,,
+0x128,,SIOCNT,16,rw,EXI,volatile,CKUP,15,1,I,14,1,MD1,13,1,BITLEN,12,1,START,7,1,TSEND,3,1,TRECV,2,1,SCLOCKHZ,1,1,SCLOCK,0,1,,,,,,,,,,,,,,,,,,,,,
 0x128,,SIOCNT_MULTI,16,rw,EXI,volatile,CKUP,15,1,I,14,1,MD1,13,1,MD0,12,1,START,7,1,ERROR,6,1,MULTIID,4,2,SDMON,3,1,SIMON,2,1,BAUD,0,2,,,,,,,,,,,,,,,,,,
 0x128,,SIOCNT_UART,16,rw,EXI,volatile,CKUP,15,1,MD1,13,1,MD0,12,1,RECVEF,11,1,SENDEF,10,1,PARITYEF,9,1,FIFOEF,8,1,DATALEN,7,1,ERROR,6,1,RECV,5,1,SEND,4,1,PARITYCNT,3,1,CTS,2,1,BAUD,0,2,,,,,,
 0x12a,,SIOCNT_H,16,rw,EXI,volatile,RFFUL,15,1,TFEMP,14,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -157,7 +158,7 @@
 0x136,defined(SDK_TS),RCNT0_H,16,rw,EXI,volatile,DATA_R7,7,1,DATA_R6,6,1,DATA_R5,5,1,DATA_R4,4,1,DATA_R3,3,1,DATA_R2,2,1,DATA_R1,1,1,DATA_R0,0,1,,,,,,,,,,,,,,,,,,,,,,,,
 0x138,!defined(SDK_TS),RCNT1,16,rw,EXI,volatile,DIR_RB,7,1,DIR_RA,6,1,DIR_R9,5,1,DIR_R8,4,1,DATA_RB,3,1,DATA_RA,2,1,DATA_R9,1,1,DATA_R8,0,1,,,,,,,,,,,,,,,,,,,,,,,,
 0x138,defined(SDK_TS),RCNT1,16,rw,EXI,volatile,DIR_RF,15,1,DIR_RE,14,1,DIR_RD,13,1,DIR_RC,12,1,DATA_RF,11,1,DATA_RE,10,1,DATA_RD,9,1,DATA_RC,8,1,DIR_RB,7,1,DIR_RA,6,1,DIR_R9,5,1,DIR_R8,4,1,DATA_RB,3,1,DATA_RA,2,1,DATA_R9,1,1,DATA_R8,0,1
-#JOY,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+#JOY,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x140,,JOYCNT,16,rw,EXI,volatile,MOD,7,1,I,6,1,SEND,2,1,RECV,1,1,RESET,0,1,,,,,,,,,,,,
 0x150,,JOY_RECV,32,rw,EXI,volatile,RECVDATA,0,32,,,,,,,,,,,,,,,,,,,,,,,,
 0x154,,JOY_TRANS,32,rw,EXI,volatile,SENDDATA,0,32,,,,,,,,,,,,,,,,,,,,,,,,
@@ -189,7 +190,7 @@
 0x204,,EXMEMCNT_L,16,rw,MI,volatile,EP,15,1,MP,11,1,MP_B,10,1,CP,7,1,PHI,5,2,ROM2nd,4,1,ROM1st,2,2,RAM,0,2,,,
 0x206,,EXMEMCNT_H,16,rw,MI,volatile,PHI33M,7,1,WW1_2nd,5,1,WW1_1st,3,2,WW0_2nd,2,1,WW0_1st,0,2,,,,,,,,,,,,
 #割り込み twl p141 〜 149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x208,,IME,16,rw,OS,volatile,IME,0,1,,,,,,,,,,,,,,,,,,,,,,,,
+0x208,,IME,16,rw,OS,volatile,IME,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x210,,IE,32,rw,OS,volatile,D7,31,1,D6,30,1,D5,29,1,D4,28,1,MI_B,27,1,MC_B,26,1,J_TX,25,1,WL,24,1,SPI,23,1,PM,22,1,J_RX,21,1,MI,20,1,MC,19,1,IFN,18,1,IFE,17,1,A7,16,1,MC_B_DET,15,1,MC_DET,14,1,I_D,13,1,K,12,1,D3,11,1,D2,10,1,D1,9,1,D0,8,1,T3,6,1,T2,5,1,T1,4,1,T0,3,1,VE,2,1,HB,1,1,VB,0,1
 0x214,,IF,32,rw,OS,volatile,D7,31,1,D6,30,1,D5,29,1,D4,28,1,MI_B,27,1,MC_B,26,1,J_TX,25,1,SPI,23,1,PM,22,1,MI,20,1,J_RX,21,1,MC,19,1,IFN,18,1,IFE,17,1,A7,16,1,MC_B_DET,15,1,MC_DET,14,1,I_D,13,1,K,12,1,D3,11,1,D2,10,1,D1,9,1,D0,8,1,T3,6,1,T2,5,1,T1,4,1,T0,3,1,VE,2,1,HB,1,1,VB,0,1,,,
 0x218,,IE2,32,rw,OS,volatile,MIC,14,1,I2C,13,1,AES,12,1,WSDIO,11,1,WSD,10,1,SDIO,9,1,SD,8,1,IO33_3,7,1,IO33_2,6,1,IO33_1,5,1,IO33_0,4,1,IO18_2,2,1,IO18_1,1,1,IO18_0,0,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -205,7 +206,7 @@
 0x400,,SOUND0CNT,32,rw,SND,volatile,E,31,1,FORMAT,29,2,REPEAT,27,2,DUTY,24,3,PAN,16,7,HOLD,15,1,SHIFT,8,2,VOLUME,0,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x400,,SOUND0CNT_VOL_16,16,rw,SND,volatile,HOLD,15,1,SHIFT,8,2,VOLUME,0,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x400,,SOUND0CNT_VOL,8,rw,SND,volatile,VOLUME,0,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x402,,SOUND0CNT_PAN,8,rw,SND,volatile,PAN,0,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x402,,SOUND0CNT_PAN,8,rw,SND,volatile,PAN,0,7,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x403,,SOUND0CNT_8,8,rw,SND,volatile,E,7,1,FORMAT,5,2,REPEAT,3,2,DUTY,0,3,,,,,,,,,,,,,,,,,,
 0x404,,SOUND0SAD,32,w,SND,volatile,SRC,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x408,,SOUND0TMR,16,w,SND,volatile,TIMER,0,16,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -221,5 +222,5 @@
 0x509,,SNDCAP1CNT,8,rw,SND,volatile,E,7,1,FORMAT,3,1,REPEAT,2,1,IN,1,1,OUT,0,1,,,,,,,,,,,,,,,
 0x510,,SNDCAP0DAD,32,w,SND,volatile,DEST,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
 0x514,,SNDCAP0LEN,16,rw,SND,volatile,LEN,0,16,,,,,,,,,,,,,,,,,,,,,,,,,,,
-0x518,,SNDCAP1DAD,32,w,SND,volatile,DEST,0,27,,,,,,,,,,,,,,,,,,,,,,,,,,,
+0x518,,SNDCAP1DAD,32,w,SND,volatile,DEST,0,27
 0x51c,,SNDCAP1LEN,16,rw,SND,volatile,LEN,0,16
diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs
index 5fa5941..ba558b1 100644
--- a/build/buildtools/commondefs
+++ b/build/buildtools/commondefs
@@ -180,6 +180,8 @@ endif
 
 TWL_LIBS ?= $(addsuffix $(TWL_LIBSUFFIX).a,$(TWL_LIBS_BASE))
 
+TWL_LDEPENDS_DBG ?= $(TWLSDK_ROOT)/build/libraries/os/common/os_printf.c \
+
 #----------------------------------------------------------------------------
 #  CYGWIN TOOLS
 #
diff --git a/build/buildtools/modulerules.add-ins.twl b/build/buildtools/modulerules.add-ins.twl
index ee401d7..c677180 100644
--- a/build/buildtools/modulerules.add-ins.twl
+++ b/build/buildtools/modulerules.add-ins.twl
@@ -17,15 +17,19 @@
 ifndef TWLSDK_MODULERULES_
 
 #----------------------------------------------------------------------------
-.PHONY: 	twllib twldbg
+.PHONY: 	twltop twllib twldbg
+
+twltop:
+	@$(MAKE) -C $(TWLSDK_ROOT)
 
 twllib:
 	@$(MAKE) -C $(TWLSDK_ROOT)/build/buildsetup
 	@$(MAKE) -C $(TWLSDK_ROOT)/build/libraries
 
 twldbg:
-	@$(TOUCH) $(TWLSDK_ROOT)/build/libraries/os/common/os_printf.c
-	@$(MAKE) -C $(TWLSDK_ROOT)/build/libraries
+	@$(TOUCH) $(TWL_LDEPENDS_DBG)
+	@$(MAKE) -C $(TWLSDK_ROOT)/build/libraries/os
+	@+$(REMAKE)
 
 # .axf
 $(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX)
diff --git a/build/libraries/os/ARM7/os_terminate_sp.c b/build/libraries/os/ARM7/os_terminate_sp.c
deleted file mode 100644
index 65c7017..0000000
--- a/build/libraries/os/ARM7/os_terminate_sp.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*---------------------------------------------------------------------------*
-  Project:  NitroSDK - OS
-  File:     os_terminate_sp.c
-
-  Copyright 2006 Nintendo.  All rights reserved.
-
-  These coded instructions, statements, and computer programs contain
-  proprietary information of Nintendo of America Inc. and/or Nintendo
-  Company Ltd., and are protected by Federal copyright law.  They may
-  not be disclosed to third parties or copied or duplicated in any form,
-  in whole or in part, without the prior written consent of Nintendo.
-
-  $Log: os_terminate_sp.c,v $
-  Revision 1.3  2006/07/05 09:25:28  yosizaki
-  fix about include header.
-
-  Revision 1.2  2006/01/18 02:11:30  kitase_hirotake
-  do-indent
-
-  Revision 1.1  2006/01/10 05:58:35  okubata_ryoma
-  os_terminate_sp.cの追加
-
-  $NoKeywords: $
- *---------------------------------------------------------------------------*/
-#include <nitro/os.h>
-#include <nitro/ctrdg.h>
-
-//============================================================================
-//          TERMINATE and HALT
-//============================================================================
-/*---------------------------------------------------------------------------*
-  Name:         OS_Terminate
-
-  Description:  Halt CPU and loop
-  
-  Arguments:    None
-
-  Returns:      --  (Never return)
- *---------------------------------------------------------------------------*/
-SDK_WEAK_SYMBOL void OS_Terminate(void)
-{
-    //VIB_STOP
-    CTRDG_VibPulseEdgeUpdate(NULL);
-
-    while (1)
-    {
-        (void)OS_DisableInterrupts();
-        OS_Halt();
-    }
-}
-
-/*---------------------------------------------------------------------------*
-  Name:         OS_Exit
-
-  Description:  Display exit string and Terminate.
-                This is useful for 'loadrun' tool command.                 
-  
-  Arguments:    status : exit status
-
-  Returns:      --  (Never return)
- *---------------------------------------------------------------------------*/
-SDK_WEAK_SYMBOL void OS_Exit(int status)
-{
-#ifdef SDK_FINALROM
-#pragma unused( status )
-#endif
-    (void)OS_DisableInterrupts();
-    OS_Printf("\n" OS_EXIT_STRING, status);
-    OS_Terminate();
-}
-
-/*---------------------------------------------------------------------------*
-  Name:         OS_Halt
-
-  Description:  Halt CPU
-  
-  Arguments:    None
-
-  Returns:      None
- *---------------------------------------------------------------------------*/
-#ifdef SDK_DEBUGGER_ARM
-#include <nitro/code32.h>
-SDK_WEAK_SYMBOL asm void OS_Halt( void )
-{
-        mov     r0, #0
-        mcr     p15, 0, r0, c7, c0, 4
-        bx      lr
-}
-#include <nitro/codereset.h>
-#endif
diff --git a/build/libraries/os/common/os_emulator.c b/build/libraries/os/common/os_emulator.c
index bb41b2d..15b5686 100644
--- a/build/libraries/os/common/os_emulator.c
+++ b/build/libraries/os/common/os_emulator.c
@@ -283,9 +283,11 @@ BOOL OSi_IsRunOnDebugger(void)
   Returns:      TRUE  : debugger
                 FALSE : not debugger
  *---------------------------------------------------------------------------*/
-#ifdef SDK_ARM7
 BOOL OSi_IsRunOnDebuggerTWL(void)
 {
+#ifdef SDK_ARM9
+    BOOL retval = TRUE;
+#else // SDK_ARM7
     // デバッガの対応により、JTAG-DEBUG通信割り込みによる検出の可能性もある（NANDファームにてJTAGイネーブル）。
     // DEBUGボタンによる検出などはセキュリティ上の問題がある（デバッガへのなりすましが容易）。
     OSChipType type = (OSChipType)(reg_CFG_BONDING & REG_CFG_BONDING_CHIP_TYPE_MASK);
@@ -295,7 +297,7 @@ BOOL OSi_IsRunOnDebuggerTWL(void)
     {
         retval = TRUE;
     }
+#endif // SDK_ARM7
 
     return retval;
 }
-#endif // SDK_ARM7
diff --git a/build/libraries/os/common/os_printf.c b/build/libraries/os/common/os_printf.c
index 797a09f..15ff7ca 100644
--- a/build/libraries/os/common/os_printf.c
+++ b/build/libraries/os/common/os_printf.c
@@ -182,7 +182,7 @@
 
   $NoKeywords: $
  *---------------------------------------------------------------------------*/
-#include        <nitro.h>
+#include        <twl.h>
 #include        <twl/vlink.h>
 
 #ifdef          SDK_LINK_ISD
@@ -345,7 +345,10 @@ static void OS_PutStringISD(const char *str)
 #ifndef SDK_FINALROM
 static void OS_PutStringKMC(const char *str)
 {
-    vlink_dos_putstring_console((char *)str, STD_GetStringLength(str));
+    if ( OSi_IsRunOnDebuggerTWL() )
+    {
+        vlink_dos_putstring_console((char *)str, STD_GetStringLength(str));
+    }
 }
 #endif
 
@@ -358,9 +361,11 @@ static void OS_PutStringKMC(const char *str)
 #include <nitro/code32.h>
 asm void OS_PutStringARM(const char *str)
 {
-    	mov     r1, r0
-    	mov     r0, #0x04
-    	swi     0x123456
+        // SWIハンドラで対処しているためデバッガ識別不要
+        mov     r1, r0
+        mov     r0, #0x04
+        swi     0x123456
+
         bx      lr
 }
 #include <nitro/codereset.h>
diff --git a/build/libraries/os/common/os_spinLock.c b/build/libraries/os/common/os_spinLock.c
index 98347ed..2e2bf7d 100644
--- a/build/libraries/os/common/os_spinLock.c
+++ b/build/libraries/os/common/os_spinLock.c
@@ -206,11 +206,8 @@ static void OSi_WaitByLoop(void);
  *---------------------------------------------------------------------------*/
 static inline void OSi_WaitByLoop(void)
 {
-#ifdef SDK_DEBUGGER_ARM
-    OS_SpinWait(0x1000);
-#else
     SVC_WaitByLoop(0x1000 / 4);
-#endif
+    // OS_SpinWait(0x1000);
 }
 
 //======================================================================
diff --git a/build/libraries/os/common/os_system.c b/build/libraries/os/common/os_system.c
index 5eeaec5..882592f 100644
--- a/build/libraries/os/common/os_system.c
+++ b/build/libraries/os/common/os_system.c
@@ -295,7 +295,7 @@ asm OSProcMode OS_GetProcMode( void )
 
   Returns:      None
  *---------------------------------------------------------------------------*/
-#if defined(SDK_ARM9) || defined(SDK_DEBUGGER_ARM)
+#if defined(SDK_ARM9)
 #include <nitro/code32.h>
 asm void  OS_SpinWait( u32 cycle )
 {
@@ -366,11 +366,7 @@ void OS_WaitInterrupt(BOOL clear, OSIrqMask irqFlags)
  *---------------------------------------------------------------------------*/
 void OS_WaitVBlankIntr(void)
 {
-#ifdef SDK_DEBUGGER_ARM
-    OS_SpinWait(4);
-#else
     SVC_WaitByLoop(1);
-#endif
 #if defined(SDK_ENABLE_ARM7_PRINT) && defined(SDK_ARM9)
     // PrintServer for ARM7 (if specified)
     OS_PrintServer();
diff --git a/include/nitro/os/common/system.h b/include/nitro/os/common/system.h
index 9a6a6ad..a66a4a8 100644
--- a/include/nitro/os/common/system.h
+++ b/include/nitro/os/common/system.h
@@ -293,7 +293,7 @@ extern void OS_Terminate(void);
 
   Returns:      None
  *---------------------------------------------------------------------------*/
-#if defined(SDK_ARM9) || defined(SDK_DEBUGGER_ARM)
+#if defined(SDK_ARM9)
 extern void OS_Halt(void);
 #else
 static inline void OS_Halt(void)
diff --git a/tools/axd/ARM7.ses b/tools/axd/ARM7.ses
index 16e844b..0ecb8bd 100644
--- a/tools/axd/ARM7.ses
+++ b/tools/axd/ARM7.ses
@@ -30,14 +30,13 @@ biBarID_1114115=GHBAAAAAPNAAAAAAJMCAAAAABJAAAAAAMGAAAAAAAIAAAAAAPCBAAAAADPBAAAAA
 biBarID_65538=LMAAAAAAIGBAAAAAAMAAAAAAIEAAAAAAAMAAAAAAICAAAAAANCFAAAAADJAAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 biBarID_1=AMAAAAAABJAAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOPPPPPPPCHBAAAAAAAAAAAAAAAPIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 biBarID_65540=IMBAAAAADIBAAAAAILDAAAAAIEAAAAAAAMAAAAAAEMAAAAAAHHEAAAAAPLCAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-biBarID_7=HIBAAAAABJAAAAAAJLDAAAAABJAAAAAAMGAAAAAAAIAAAAAALHDAAAAAOLBAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+biBarID_7=HIBAAAAABJAAAAAAJLDAAAAABJAAAAAAMGAAAAAAAIAAAAAALHDAAAAAOLBAAAAACAAAAAAABAPCHKBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 biBarID_6=AMAAAAAABJAAAAAAAMAAAAAAIEAAAAAAAMAAAAAAICAAAAAAOPPPPPPPMBAAAAAAAAAAAAAAAAPBAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 biBarID_65543=AMAAAAAABJAAAAAAJLDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOPPPPPPPCHBAAAAAAAAAAAAAAAPIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 [Docking\OpenStates]
 biBarID_0=BAAAAAAA
 biBarID_4=BAAAAAAA
 biBarID_6=BAAAAAAA
-biBarID_7=BAAAAAAA
 biBarID_65538=BAAAAAAA
 biBarID_65539=BAAAAAAA
 biBarID_65540=BAAAAAAA
@@ -178,7 +177,7 @@ dwListSize=4
 dwTargetAccessSize=0
 dwAutoRefresh=1
 [Output]
-dwActiveTab=1
+dwActiveTab=0
 [ProcessorRegisters\ARM7TDMI_1]
 dwFormatID=-1
 dwRefresh=0
@@ -203,7 +202,7 @@ dwMode=1
 dwCommsChannel=0
 dwArmSWI=1193046
 dwThumbSWI=171
-dwSHVector=132
+dwSHVector=136
 dwDCCSHVector=458752
 dwECVector=26
 dwTopOfMemory=524288
@@ -240,23 +239,13 @@ dwBar#2=0
 dwBarID=59423
 dwHorz=1
 dwFloating=1
-dwXPos=895
-dwYPos=466
-dwBars=3
-dwBar#0=0
-dwBar#1=7
-dwBar#2=0
-[ToolBars\ToolBarID-Bar4]
-dwBarID=59423
-dwHorz=1
-dwFloating=1
 dwXPos=1329
 dwYPos=167
 dwBars=3
 dwBar#0=0
 dwBar#1=2
 dwBar#2=0
-[ToolBars\ToolBarID-Bar5]
+[ToolBars\ToolBarID-Bar4]
 dwBarID=59423
 dwHorz=1
 dwFloating=1
@@ -266,7 +255,7 @@ dwBars=3
 dwBar#0=0
 dwBar#1=3
 dwBar#2=0
-[ToolBars\ToolBarID-Bar6]
+[ToolBars\ToolBarID-Bar5]
 dwBarID=59423
 dwHorz=1
 dwFloating=1
@@ -277,7 +266,7 @@ dwBar#0=0
 dwBar#1=4
 dwBar#2=0
 [ToolBars\ToolBarID-Summary]
-dwBars=7
+dwBars=6
 dwScreenCX=1600
 dwScreenCY=1200
 [Variables]
@@ -315,7 +304,7 @@ biWndPlacement=MCAAAAAAAAAAAAAABAAAAAAAPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPGBAAAAAAG
 UnitName=ARM7TDMI_1
 ImageName=C:\twl\twl_wrapsdk_bak\build\tests\os\_ARM7-alarm-2\bin\ARM7-BB\Release\main.axf
 dwDisassembly=0
-FileName=C:\twl\twl_wrapsdk_bak\build\libraries\os\ARM7\os_terminate_sp.c
+FileName=C:\nitro-sdk\NitroSDK\build\libraries\os\common\src\os_thread.c
 dwMixedView=0
 dwShowMargin=1
 dwShowLineNumbers=1
diff --git a/tools/axd/ARM9.ses b/tools/axd/ARM9.ses
index d0e08cb..2f6b6c3 100644
--- a/tools/axd/ARM9.ses
+++ b/tools/axd/ARM9.ses
@@ -160,7 +160,7 @@ dwMode=1
 dwCommsChannel=0
 dwArmSWI=1193046
 dwThumbSWI=171
-dwSHVector=-65220
+dwSHVector=-65216
 dwDCCSHVector=458752
 dwECVector=27
 dwTopOfMemory=524288
diff --git a/tools/prom/brom_bb_dev_070423.exo b/tools/prom/brom_bb_dev_070424.exo
similarity index 96%
rename from tools/prom/brom_bb_dev_070423.exo
rename to tools/prom/brom_bb_dev_070424.exo
index ae27907..6fa8053 100644
--- a/tools/prom/brom_bb_dev_070423.exo
+++ b/tools/prom/brom_bb_dev_070424.exo
@@ -1,5 +1,5 @@
 S02B000062696E2F41524D392D42422E7468756D622F52656C656173652F62726F6D5F62625F6465762E6578B9
-S2140000002E0000EA2E0000EA4C0000EA2C0000EA6F
+S2140000002E0000EA2E0000EA4D0000EA2C0000EA6E
 S2140000102B0000EAFEFFFFEA3E0000EA280000EAA6
 S21400002024FFAE51699AA2213D84820A84E409AD78
 S21400003011248B98C0817F21A352BE199309CE202C
@@ -18,17 +18,17 @@ S2140000F001C0CDE310C09CE500005CE33CFF2F117F
 S2140001000050BDE810CF01EE0EF06FE10050BDE8E4
 S21400011004F05EE29CFDFF020F502DE9110F19EE70
 S2140001202006A0E10006A0E1010980E200E08FE2DF
-S21400013004F010E50F50BDE804F05EE21BFF2FE16F
-S21400014000582DE9B2C05EE18CC0A0E17EC00CE292
-S21400015024005CE356005C1340B08F02F6FFFF0AF3
+S21400013004F010E50F50BDE804F05EE20058BDE89C
+S2140001400EF0B0E100582DE9B2C05EE18CC0A0E12F
+S2140001507EC00CE224005CE356005C13F6FFFF0A48
 S21400016040B08FE2BCC09BE117BE4FE20BC08CE1F3
 S21400017000B04FE100082DE980B00BE21FB08BE322
 S2140001800BF02FE104402DE93CFF2FE10440BDE8D1
 S214000190D3C0A0E30CF02FE10008BDE80BF06FE140
-S2140001A00058BDE80EF0B0E10000000000000405B5
-S2140001B01C051005F8040000150000EB290000EBF4
+S2140001A00058BDE80EF0B0E184058405840504051A
+S2140001B01C051005F8048405150000EB290000EB6B
 S2140001C0430000EB10009FE510109FE59B2FA0E377
-S2140001D0840000EB730100FA00F09FE5E801FFFFE2
+S2140001D0840000EB740100FA00F09FE5E801FFFFE1
 S2140001E00080FF010000000020309FE50110A0E322
 S2140001F00010C3E50900A0E3850000EB0700A0E3BC
 S214000200890000EB0300A0E3810000EBFEFFFFEA9D
@@ -87,44 +87,44 @@ S2140005400040BDE81EFF2FE101C3A0E308C2CCE5D2
 S214000550113F19EE2336A0E10336A0E1013983E20C
 S21400056008C043E200309CE5030011E00030231091
 S21400057000308C1501C3A0E30100A0E30802CCE51F
-S2140005801EFF2FE1101F11EE040001E22001A0E182
-S214000590041081E3101F01EE1EFF2FE1101F11EE65
-S2140005A0040001E22001A0E10410C1E3101F01EEE7
-S2140005B01EFF2FE1000050E30020A0030420A0133C
-S2140005C0101F11EE040001E22001A0E10410C1E3B7
-S2140005D0021081E1101F01EE1EFF2FE10000A0E3D4
-S2140005E0160F07EE1EFF2FE10010A0E30000A0E3A9
-S2140005F0002081E15A2F07EE200080E2010B50E335
-S214000600FAFFFFBA011181E2000051E3F6FFFF1A7C
-S2140006101EFF2FE100C0A0E30010A0E30000A0E34F
-S214000620002081E19ACF07EE5E2F07EE200080E2E1
-S214000630010B50E3F9FFFFBA011181E2000051E31C
-S214000640F5FFFF1A1EFF2FE1001081E01F00C0E338
-S214000650360F07EE200080E2010050E1FBFFFFBAF4
-S2140006601EFF2FE1001081E01F00C0E33A0F07EEE7
-S214000670200080E2010050E1FBFFFFBA1EFF2FE1E1
-S21400068000C0A0E3001081E01F00C0E39ACF07EE91
-S2140006903E0F07EE200080E2010050E1FAFFFFBAAD
-S2140006A01EFF2FE1001081E01F00C0E300F0D0F530
-S2140006B0200080E2010050E1FBFFFFBA1EFF2FE1A1
-S2140006C00000A0E39A0F07EE1EFF2FE1101F11EEA9
-S2140006D0010A01E22006A0E1011A81E3101F01EEE3
-S2140006E01EFF2FE1101F11EE010A01E22006A0E115
-S2140006F0011AC1E3101F01EE1EFF2FE1000050E3B8
-S2140007000020A003012AA013101F11EE010A01E227
-S2140007102006A0E1011AC1E3021081E1101F01EEDC
-S2140007201EFF2FE10000A0E3150F07EE1EFF2FE1CE
-S214000730001081E01F00C0E3350F07EE200080E2C6
-S214000740010050E1FBFFFFBA1EFF2FE1001081E021
-S2140007501F00C0E33D0F07EE200080E2010050E1DD
-S214000760FBFFFFBA1EFF2FE1100F11EE010080E322
-S214000770100F01EE1EFF2FE1100F11EE0100C0E377
-S214000780100F01EE1EFF2FE114009FE5100F01EE83
-S2140007900000A0E3150F07EE160F07EE9A0F07EE00
-S2140007A01EFF2FE17820050010B5FFF75EEE094822
-S2140007B000210161491E4161FFF7F0EEFFF72AEFC5
-S2140007C0FFF77EEFFFF78EEFFFF7ACEFFFF7DCEFFC
-S2140007D010BD000000020004000000000000000041
+S2140005801EFF2FE1FEFFFFEA101F11EE040001E23E
+S2140005902001A0E1041081E3101F01EE1EFF2FE1F1
+S2140005A0101F11EE040001E22001A0E10410C1E3D7
+S2140005B0101F01EE1EFF2FE1000050E30020A003F5
+S2140005C00420A013101F11EE040001E22001A0E198
+S2140005D00410C1E3021081E1101F01EE1EFF2FE19F
+S2140005E00000A0E3160F07EE1EFF2FE10010A0E3A9
+S2140005F00000A0E3002081E15A2F07EE200080E2F1
+S214000600010B50E3FAFFFFBA011181E2000051E34B
+S214000610F6FFFF1A1EFF2FE100C0A0E30010A0E3C4
+S2140006200000A0E3002081E19ACF07EE5E2F07EEE0
+S214000630200080E2010B50E3F9FFFFBA011181E2CE
+S214000640000051E3F5FFFF1A1EFF2FE1001081E0C6
+S2140006501F00C0E3360F07EE200080E2010050E1E5
+S214000660FBFFFFBA1EFF2FE1001081E01F00C0E372
+S2140006703A0F07EE200080E2010050E1FBFFFFBAD0
+S2140006801EFF2FE100C0A0E3001081E01F00C0E3C2
+S2140006909ACF07EE3E0F07EE200080E2010050E101
+S2140006A0FAFFFFBA1EFF2FE1001081E01F00C0E333
+S2140006B000F0D0F5200080E2010050E1FBFFFFBA19
+S2140006C01EFF2FE10000A0E39A0F07EE1EFF2FE1AA
+S2140006D0101F11EE010A01E22006A0E1011A81E3D3
+S2140006E0101F01EE1EFF2FE1101F11EE010A01E29E
+S2140006F02006A0E1011AC1E3101F01EE1EFF2FE144
+S214000700000050E30020A003012AA013101F11EEE2
+S214000710010A01E22006A0E1011AC1E3021081E10C
+S214000720101F01EE1EFF2FE10000A0E3150F07EEDD
+S2140007301EFF2FE1001081E01F00C0E3350F07EE1B
+S214000740200080E2010050E1FBFFFFBA1EFF2FE110
+S214000750001081E01F00C0E33D0F07EE200080E29E
+S214000760010050E1FBFFFFBA1EFF2FE1100F11EE54
+S214000770010080E3100F01EE1EFF2FE1100F11EEB7
+S2140007800100C0E3100F01EE1EFF2FE114009FE5ED
+S214000790100F01EE0000A0E3150F07EE160F07EE90
+S2140007A09A0F07EE1EFF2FE1782005000B4810B5C4
+S2140007B00189002101810161491E4161FFF754EE64
+S2140007C0FFF7EEEEFFF728EFFFF77CEFFFF78CEF73
+S2140007D0FFF7AAEFFFF7DAEF10BD000000020004F3
 S2140007E00000000000000000000000000000000004
 S2140007F000000000000000000000000000000000F4
 S21400080000000000000000000000000000000000E3
@@ -4095,7 +4095,7 @@ S21400FFC0000000000000000000000000000000002C
 S21400FFD0000000000000000000000000000000001C
 S21400FFE0000000000000000000000000000000000C
 S21400FFF000000000000000000000000000000000FC
-S214010000060000EA060000EA1E0000EA040000EA14
+S214010000060000EA060000EA1F0000EA040000EA13
 S214010010030000EAFEFFFFEA130000EA000000EA20
 S214010020370000EA00D00FE1C0D08DE30DF02FE1DC
 S21401003030D09FE501D08DE200502DE900E04FE180
@@ -4103,50 +4103,50 @@ S21401004000402DE901C0CDE310C09CE500005CE353
 S21401005000E08FE21CFF2F110040BDE80EF06FE1BB
 S2140100600050BDE804F05EE2DCFF80030F502DE98E
 S2140100700103A0E300E08FE204F010E50F50BDE8B5
-S21401008004F05EE21BFF2FE100582DE9B2C05EE1ED
-S2140100908CC0A0E17EC00CE224005CE356005C1339
-S2140100A044B08F02F6FFFF0A44B08FE2BCC09BE16A
+S21401008004F05EE20058BDE80EF0B0E100582DE93C
+S214010090B2C05EE18CC0A0E17EC00CE224005CE34D
+S2140100A056005C13F6FFFF0A44B08FE2BCC09BE12A
 S2140100B0B8B04FE20BC08CE100B04FE100082DE96B
 S2140100C080B00BE21FB08BE30BF02FE104402DE96B
 S2140100D000E08FE21CFF2FE10440BDE8D3C0A0E39F
 S2140100E00CF02FE10008BDE80BF06FE10058BDE809
-S2140100F00EF0B0E10000000000006C0288027802F9
-S214010100F402FC0234309FE52010A0E3B010C3E1F6
-S2140101100900A0E34A0000EB240000EB0000A0E386
-S2140101201C109FE50229A0E33A0000EB14009FE5AE
-S2140101300E15A0E3472FA0E3300000EB0EF5A0E379
-S2140101400803000400807F03500100000000000047
-S21401015048309FE50110A0E30010C3E540309FE55D
-S2140101600010D3E50010C1E30010C3E50700A0E3CB
-S2140101702D0000EB0900A0E3310000EB0300A0E333
-S214010180290000EB1C309FE50300A0E30000C3E557
-S21401019014309FE50100A0E30000C3E5FEFFFFEA7F
-S2140101A00140000402400004064000040740000429
-S2140101B034309FE534109FE5010A81E3000083E5B2
-S2140101C02C309FE52C209FE5021081E0020A81E396
-S2140101D0000083E520309FE518209FE5021081E0AE
-S2140101E0020A81E3000083E51EFF2FE1544000046C
-S2140101F01008300858400004200020005C4000042D
-S21401020002C081E00C0051E10400B0B80400A1B8BE
-S214010210FBFFFFBA1EFF2FE102C081E00C0051E197
-S2140102200100A1B8FCFFFFBA1EFF2FE10C309FE5CD
-S2140102300004A0E10F0C00E2000083E51EFF2FE1A1
-S214010240800100040C301FE5001093E50F1001E259
-S214010250010050E1FBFFFF1A1EFF2FE1040040E200
-S214010260040050E2FDFFFF2A1EFF2FE1010050E2CD
-S214010270FDFFFFCA1EFF2FE10100A0E30110A0E36E
-S2140102800020A0E30000A0E100402DE9000050E3BB
-S2140102900700001B80E0A0E301E3CCE50000A0E13D
-S2140102A00000A0E1020000EBF9FFFF0A0040BDE8F4
-S2140102B01EFF2FE101C3A0E308C2CCE52CC09FE5D9
-S2140102C000309CE5030011E00030231000308C154F
-S2140102D038301CE5030012E00030231038300C15CE
-S2140102E001C3A0E30100A0E30802CCE51EFF2FE155
-S2140102F0F8FF80038020A0E3010000EAC020A0E30D
-S2140103000000A0E101C3A0E30123CCE50000A0E1C9
-S2140103100000A0E11EFF2FE1000000000000000029
-S21401032000000000000000000000000000000000C7
-S21401033000000000000000000000000000000000B7
+S2140100F00EF0B0E1F802F802F80270028C027C02FF
+S214010100FC02040338309FE52010A0E3B010C3E1E1
+S2140101100900A0E34B0000EB250000EB0000A0E384
+S21401012020109FE50229A0E33B0000EB18009FE5A5
+S2140101300E15A0E3472FA0E3310000EB770000EB9C
+S2140101400EF5A0E30803000400807F0354010000BD
+S2140101500000000048309FE50110A0E30010C3E551
+S21401016040309FE50010D3E50010C1E30010C3E561
+S2140101700700A0E32D0000EB0900A0E3310000EB2F
+S2140101800300A0E3290000EB1C309FE50300A0E379
+S2140101900000C3E514309FE50100A0E30000C3E5BD
+S2140101A0FEFFFFEA0140000402400004064000048E
+S2140101B00740000434309FE534109FE5010A81E3CF
+S2140101C0000083E52C309FE52C209FE5021081E09E
+S2140101D0020A81E3000083E520309FE518209FE5B1
+S2140101E0021081E0020A81E3000083E51EFF2FE191
+S2140101F05440000410083008584000042000200035
+S2140102005C40000402C081E00C0051E10400B0B87B
+S2140102100400A1B8FBFFFFBA1EFF2FE102C081E078
+S2140102200C0051E10100A1B8FCFFFFBA1EFF2FE14F
+S2140102300C309FE50004A0E10F0C00E2000083E50E
+S2140102401EFF2FE1800100040C301FE5001093E52E
+S2140102500F1001E2010050E1FBFFFF1A1EFF2FE124
+S214010260040040E2040050E2FDFFFF2A1EFF2FE1DA
+S214010270010050E2FDFFFFCA1EFF2FE10100A0E3CF
+S2140102800110A0E30020A0E30000A0E100402DE95A
+S214010290000050E30700001B80E0A0E301E3CCE58B
+S2140102A00000A0E10000A0E1020000EBF9FFFF0A58
+S2140102B00040BDE81EFF2FE101C3A0E308C2CCE564
+S2140102C02CC09FE500309CE5030011E000302310B0
+S2140102D000308C1538301CE5030012E00030231086
+S2140102E038300C1501C3A0E30100A0E30802CCE5F9
+S2140102F01EFF2FE1F8FF8003FEFFFFEA8020A0E348
+S214010300010000EAC020A0E30000A0E101C3A0E3D1
+S2140103100123CCE50000A0E10000A0E11EFF2FE1D3
+S21401032001C08FE21CFF2FE10448018900210181F1
+S21401033001614A1E42618161C26170470002000488
 S21401034000000000000000000000000000000000A7
 S2140103500000000000000000000000000000000097
 S2140103600000000000000000000000000000000087