diff --git a/AltairZ80/altairz80_cpu.c b/AltairZ80/altairz80_cpu.c index 67e5803d..574202ec 100644 --- a/AltairZ80/altairz80_cpu.c +++ b/AltairZ80/altairz80_cpu.c @@ -429,7 +429,7 @@ REG cpu_reg[] = { REG_RO }, /* 77 */ { HRDATAD (PREVCAP, previousCapacity, 32, "Previous size of RAM pseudo register"), REG_RO }, /* 78 */ - { BRDATAD (PCQ, &pcq, 16, 16, PCQ_SIZE, "Program counter circular buffer for 8080 /Z80 pseudo register"), + { BRDATAD (PCQ, pcq, 16, 16, PCQ_SIZE, "Program counter circular buffer for 8080 /Z80 pseudo register"), REG_RO + REG_CIRC }, /* 79 */ { DRDATAD (PCQP, pcq_p, PCQ_SIZE_LOG2, "Circular buffer head for 8080 / Z80 pseudo register"), REG_HRO }, /* 80 */ diff --git a/AltairZ80/altairz80_dsk.c b/AltairZ80/altairz80_dsk.c index 5b8303eb..7cbd6f22 100644 --- a/AltairZ80/altairz80_dsk.c +++ b/AltairZ80/altairz80_dsk.c @@ -187,7 +187,7 @@ static int32 sectors_per_track [NUM_OF_DSK] = { DSK_SECT, DSK_SECT, DSK_SECT, DS DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT, DSK_SECT }; -static uint8 tracks [NUM_OF_DSK] = { MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, +static int32 tracks [NUM_OF_DSK] = { MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS, MAX_TRACKS }; @@ -298,17 +298,17 @@ static UNIT dsk_unit[] = { static REG dsk_reg[] = { { DRDATAD (DISK, current_disk, 4, "Selected disk register"), }, - { BRDATAD (CURTRACK, ¤t_track, 10, 32, NUM_OF_DSK, + { BRDATAD (CURTRACK, current_track, 10, 32, NUM_OF_DSK, "Selected track register array"), REG_CIRC + REG_RO }, - { BRDATAD (CURSECTOR, ¤t_sector, 10, 32, NUM_OF_DSK, + { BRDATAD (CURSECTOR, current_sector, 10, 32, NUM_OF_DSK, "Selected sector register array"), REG_CIRC + REG_RO }, - { BRDATAD (CURBYTE, ¤t_byte, 10, 32, NUM_OF_DSK, - "Current byte register array"), REG_CIRC + REG_RO }, - { BRDATAD (CURFLAG, ¤t_flag, 10, 32, NUM_OF_DSK, + { BRDATAD (CURBYTE, current_byte, 10, 32, NUM_OF_DSK, + "Current byte register array"), REG_CIRC + REG_RO }, + { BRDATAD (CURFLAG, current_flag, 10, 32, NUM_OF_DSK, "Current flag register array"), REG_CIRC + REG_RO }, - { BRDATAD (TRACKS, &tracks, 10, 8, NUM_OF_DSK, - "Number of tracks register array"), REG_CIRC }, - { BRDATAD (SECTPERTRACK,§ors_per_track, 10, 8, NUM_OF_DSK, + { BRDATAD (TRACKS, tracks, 10, 32, NUM_OF_DSK, + "Number of tracks register array"), REG_CIRC }, + { BRDATAD (SECTPERTRACK, sectors_per_track, 10, 32, NUM_OF_DSK, "Number of sectors per track register array"), REG_CIRC }, { DRDATAD (IN9COUNT, in9_count, 4, "Count of IN(9) register"), REG_RO }, @@ -318,9 +318,9 @@ static REG dsk_reg[] = { "BOOL for write needed register"), REG_RO }, { DRDATAD (DSKWL, warnLevelDSK, 32, "Warn level register") }, - { BRDATAD (WARNLOCK, &warnLock, 10, 32, NUM_OF_DSK, + { BRDATAD (WARNLOCK, warnLock, 10, 32, NUM_OF_DSK, "Count of write to locked register array"), REG_CIRC + REG_RO }, - { BRDATAD (WARNATTACHED, &warnAttached, 10, 32, NUM_OF_DSK, + { BRDATAD (WARNATTACHED, warnAttached, 10, 32, NUM_OF_DSK, "Count for selection of unattached disk register array"), REG_CIRC + REG_RO }, { DRDATAD (WARNDSK10, warnDSK10, 4, "Count of IN(8) on unattached disk register"), REG_RO }, @@ -328,7 +328,7 @@ static REG dsk_reg[] = { "Count of IN/OUT(9) on unattached disk register"), REG_RO }, { DRDATAD (WARNDSK12, warnDSK12, 4, "Count of IN/OUT(10) on unattached disk register"), REG_RO }, - { BRDATAD (DISKBUFFER, &dskbuf, 10, 8, DSK_SECTSIZE, + { BRDATAD (DISKBUFFER, dskbuf, 10, 8, DSK_SECTSIZE, "Disk data buffer array"), REG_CIRC + REG_RO }, { NULL } }; diff --git a/AltairZ80/s100_disk3.c b/AltairZ80/s100_disk3.c index 9ce17be9..6335a128 100644 --- a/AltairZ80/s100_disk3.c +++ b/AltairZ80/s100_disk3.c @@ -204,28 +204,28 @@ static UNIT disk3_unit[] = { }; static REG disk3_reg[] = { - { DRDATAD (NTRACKS, ntracks, 10, + { DRDATAD (NTRACKS, ntracks, 10, "Number of tracks"), }, - { DRDATAD (NHEADS, nheads, 8, + { DRDATAD (NHEADS, nheads, 8, "Number of heads"), }, - { DRDATAD (NSECTORS, nsectors, 8, + { DRDATAD (NSECTORS, nsectors, 8, "Number of sectors per track"), }, - { DRDATAD (SECTSIZE, sectsize, 11, + { DRDATAD (SECTSIZE, sectsize, 11, "Sector size not including pre/postamble"), }, - { HRDATAD (SEL_DRIVE, disk3_info_data.sel_drive, 3, + { HRDATAD (SEL_DRIVE, disk3_info_data.sel_drive, 3, "Currently selected drive"), }, - { HRDATAD (MODE, disk3_info_data.mode, 8, + { HRDATAD (MODE, disk3_info_data.mode, 8, "Mode (0xFF=absolute, 0x00=logical)"), }, - { HRDATAD (RETRIES, disk3_info_data.retries, 8, + { HRDATAD (RETRIES, disk3_info_data.retries, 8, "Number of retries to attempt"), }, - { HRDATAD (NDRIVES, disk3_info_data.ndrives, 8, + { HRDATAD (NDRIVES, disk3_info_data.ndrives, 8, "Number of drives attached to the controller"), }, - { HRDATAD (LINK_ADDR, disk3_info_data.link_addr, 32, + { HRDATAD (LINK_ADDR, disk3_info_data.link_addr, 32, "Link address for next IOPB"), }, - { HRDATAD (DMA_ADDR, disk3_info_data.dma_addr, 32, + { HRDATAD (DMA_ADDR, disk3_info_data.dma_addr, 32, "DMA address for the current IOPB"), }, - { BRDATAD (IOPB, &disk3_info_data.iopb, 16, 8, 16, - "IOPB command register"), } , + { BRDATAD (IOPB, disk3_info_data.iopb, 16, 8, 16, + "IOPB command register"), }, { NULL } }; diff --git a/AltairZ80/s100_fif.c b/AltairZ80/s100_fif.c index ed29e3d6..8ee896de 100644 --- a/AltairZ80/s100_fif.c +++ b/AltairZ80/s100_fif.c @@ -93,7 +93,7 @@ static REG fif_reg[] = { "Current selected disk") }, { DRDATAD (DSKWL, warnLevelDSK, 32, "Warn level register") }, - { BRDATAD (WARNATTACHED, &warnAttached, 10, 32, NUM_OF_DSK, + { BRDATAD (WARNATTACHED, warnAttached, 10, 32, NUM_OF_DSK, "Count for selection of unattached disk register array"), REG_CIRC + REG_RO }, { DRDATAD (WARNDSK11, warnDSK11, 4, "Count of IN/OUT(9) on unattached disk register"), REG_RO }, diff --git a/AltairZ80/s100_if3.c b/AltairZ80/s100_if3.c index ac947663..db1cc6d3 100644 --- a/AltairZ80/s100_if3.c +++ b/AltairZ80/s100_if3.c @@ -105,12 +105,12 @@ static uint8 if3_risr[IF3_MAX_BOARDS] = { 0, 0, 0, 0 }; static uint8 if3_tisr[IF3_MAX_BOARDS] = { 0, 0, 0, 0 }; static REG if3_reg[] = { - { HRDATAD (USER, if3_user, 3, "IF3 user register"), }, - { HRDATAD (BOARD, if3_board, 2, "IF3 board register"), }, - { BRDATAD (RIMR, &if3_rimr, 16, 8, 4, "IF3 RIMR register array"), }, - { BRDATAD (RISR, &if3_risr, 16, 8, 4, "IF3 RISR register array"), }, - { BRDATAD (TIMR, &if3_timr, 16, 8, 4, "IF3 TIMR register array"), }, - { BRDATAD (TISR, &if3_tisr, 16, 8, 4, "IF3 TISR register array"), }, + { HRDATAD (USER, if3_user, 3, "IF3 user register"), }, + { HRDATAD (BOARD, if3_board, 2, "IF3 board register"), }, + { BRDATAD (RIMR, if3_rimr, 16, 8, IF3_MAX_BOARDS, "IF3 RIMR register array"), }, + { BRDATAD (RISR, if3_risr, 16, 8, IF3_MAX_BOARDS, "IF3 RISR register array"), }, + { BRDATAD (TIMR, if3_timr, 16, 8, IF3_MAX_BOARDS, "IF3 TIMR register array"), }, + { BRDATAD (TISR, if3_tisr, 16, 8, IF3_MAX_BOARDS, "IF3 TISR register array"), }, { NULL } }; diff --git a/AltairZ80/s100_ss1.c b/AltairZ80/s100_ss1.c index eee0461f..7f3ae77a 100644 --- a/AltairZ80/s100_ss1.c +++ b/AltairZ80/s100_ss1.c @@ -173,27 +173,27 @@ static UNIT ss1_unit[] = { }; static REG ss1_reg[] = { - { HRDATAD (MPIC_IMR, ss1_pic[MASTER_PIC].IMR, 8, "Master IMR register"), }, - { HRDATAD (MPIC_IRR, ss1_pic[MASTER_PIC].IRR, 8, "Master IRR register"), }, - { HRDATAD (MPIC_ISR, ss1_pic[MASTER_PIC].ISR, 8, "Master ISR register"), }, - { HRDATAD (MPIC_OCW2, ss1_pic[MASTER_PIC].OCW2, 8, "Master OCW2 register"), }, - { HRDATAD (MPIC_OCW3, ss1_pic[MASTER_PIC].OCW3, 8, "Master OCW3 register"), }, + { HRDATAD (MPIC_IMR, ss1_pic[MASTER_PIC].IMR, 8, "Master IMR register"), }, + { HRDATAD (MPIC_IRR, ss1_pic[MASTER_PIC].IRR, 8, "Master IRR register"), }, + { HRDATAD (MPIC_ISR, ss1_pic[MASTER_PIC].ISR, 8, "Master ISR register"), }, + { HRDATAD (MPIC_OCW2, ss1_pic[MASTER_PIC].OCW2, 8, "Master OCW2 register"), }, + { HRDATAD (MPIC_OCW3, ss1_pic[MASTER_PIC].OCW3, 8, "Master OCW3 register"), }, - { HRDATAD (SPIC_IMR, ss1_pic[SLAVE_PIC].IMR, 8, "Slave IMR register"), }, - { HRDATAD (SPIC_IRR, ss1_pic[SLAVE_PIC].IRR, 8, "Slave IRR register"), }, - { HRDATAD (SPIC_ISR, ss1_pic[SLAVE_PIC].ISR, 8, "Slave ISR register"), }, - { HRDATAD (SPIC_OCW2, ss1_pic[SLAVE_PIC].OCW2, 8, "Slave OCW2 register"), }, - { HRDATAD (SPIC_OCW3, ss1_pic[SLAVE_PIC].OCW3, 8, "Slave OCW3 register"), }, + { HRDATAD (SPIC_IMR, ss1_pic[SLAVE_PIC].IMR, 8, "Slave IMR register"), }, + { HRDATAD (SPIC_IRR, ss1_pic[SLAVE_PIC].IRR, 8, "Slave IRR register"), }, + { HRDATAD (SPIC_ISR, ss1_pic[SLAVE_PIC].ISR, 8, "Slave ISR register"), }, + { HRDATAD (SPIC_OCW2, ss1_pic[SLAVE_PIC].OCW2, 8, "Slave OCW2 register"), }, + { HRDATAD (SPIC_OCW3, ss1_pic[SLAVE_PIC].OCW3, 8, "Slave OCW3 register"), }, - { HRDATAD (T0_MODE, ss1_tc[0].mode, 3, "Timer 0 mode register"), }, - { HRDATAD (T0_COUNT, ss1_tc[0].count, 16, "Timer 0 count register"), }, - { HRDATAD (T1_MODE, ss1_tc[1].mode, 3, "Timer 1 mode register"), }, - { HRDATAD (T1_COUNT, ss1_tc[1].count, 16, "Timer 1 count register"), }, - { HRDATAD (T2_MODE, ss1_tc[2].mode, 3, "Timer 2 mode register"), }, - { HRDATAD (T2_COUNT, ss1_tc[2].count, 16, "Timer 2 count register"), }, + { HRDATAD (T0_MODE, ss1_tc[0].mode[0], 3, "Timer 0 mode register"), }, + { HRDATAD (T0_COUNT, ss1_tc[0].count[0], 16, "Timer 0 count register"), }, + { HRDATAD (T1_MODE, ss1_tc[0].mode[1], 3, "Timer 1 mode register"), }, + { HRDATAD (T1_COUNT, ss1_tc[0].count[1], 16, "Timer 1 count register"), }, + { HRDATAD (T2_MODE, ss1_tc[0].mode[2], 3, "Timer 2 mode register"), }, + { HRDATAD (T2_COUNT, ss1_tc[0].count[2], 16, "Timer 2 count register"), }, - { HRDATAD (RTC_DIGIT, ss1_rtc[0].digit_sel, 4, "Digit selector register"), }, - { HRDATAD (RTC_FLAGS, ss1_rtc[0].flags, 4, "Flags register"), }, + { HRDATAD (RTC_DIGIT, ss1_rtc[0].digit_sel, 4, "Digit selector register"), }, + { HRDATAD (RTC_FLAGS, ss1_rtc[0].flags, 4, "Flags register"), }, { NULL } };