Skip to content

Commit 610277e

Browse files
authored
Merge pull request #719 from uyjulian/regdesc_20250111
Improve register descriptions 20250111
2 parents bc22eb7 + a593584 commit 610277e

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

common/include/dev5_mmio_hwport.h

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,61 +22,61 @@ typedef struct dev5_mmio_hwport_ /* base -> 0xBF402000 */
2222
vu8 m_dev5_reg_001;
2323
vu8 m_dev5_reg_002;
2424
vu8 m_dev5_reg_003;
25-
vu8 m_dev5_reg_004;
26-
vu8 m_dev5_reg_005;
27-
vu8 m_dev5_reg_006;
28-
vu8 m_dev5_reg_007;
29-
vu8 m_dev5_reg_008;
30-
vu8 m_dev5_reg_009;
31-
vu8 m_dev5_reg_00A;
32-
vu8 m_dev5_reg_00B;
33-
vu8 m_dev5_reg_00C;
34-
vu8 m_dev5_reg_00D;
35-
vu8 m_dev5_reg_00E;
36-
vu8 m_dev5_reg_00F;
25+
vu8 m_dev5_reg_004; /**< CDVDreg_NCOMMAND; Current N command (R/W) */
26+
vu8 m_dev5_reg_005; /**< CDVDreg_READY / CDVDreg_NDATAIN; N command status (R) / N command param (W) */
27+
vu8 m_dev5_reg_006; /**< CDVDreg_ERROR / CDVDreg_HOWTO; CDVD error (R) */
28+
vu8 m_dev5_reg_007; /**< CDVDreg_ABORT; BREAK */
29+
vu8 m_dev5_reg_008; /**< CDVDreg_PWOFF; CDVD I_STAT (R=Status, W=Acknowledge) */
30+
vu8 m_dev5_reg_009; /* Accessed */
31+
vu8 m_dev5_reg_00A; /**< CDVDreg_STATUS; CDVD drive status (R) */
32+
vu8 m_dev5_reg_00B; /**< CDVDreg_STICKY_STATUS; Sticky drive status (R) */
33+
vu8 m_dev5_reg_00C; /* Accessed */
34+
vu8 m_dev5_reg_00D; /* Accessed */
35+
vu8 m_dev5_reg_00E; /* Accessed */
36+
vu8 m_dev5_reg_00F; /**< CDVDreg_TYPE; CDVD disk type (R) */
3737
vu8 m_dev5_reg_010;
3838
vu8 m_dev5_reg_011;
3939
vu8 m_dev5_reg_012;
40-
vu8 m_dev5_reg_013;
40+
vu8 m_dev5_reg_013; /* Accessed */
4141
vu8 m_dev5_reg_014;
42-
vu8 m_dev5_reg_015;
43-
vu8 m_dev5_reg_016;
44-
vu8 m_dev5_reg_017;
45-
vu8 m_dev5_reg_018;
42+
vu8 m_dev5_reg_015; /* Accessed */
43+
vu8 m_dev5_reg_016; /**< CDVDreg_SCOMMAND; Current S command (R/W) */
44+
vu8 m_dev5_reg_017; /**< CDVDreg_SDATAIN; S command status (R), S command params (W) */
45+
vu8 m_dev5_reg_018; /**< CDVDreg_SDATAOUT; S command result (R) */
4646
vu8 m_dev5_reg_019;
4747
vu8 m_dev5_reg_01A;
4848
vu8 m_dev5_reg_01B;
4949
vu8 m_dev5_reg_01C;
5050
vu8 m_dev5_reg_01D;
5151
vu8 m_dev5_reg_01E;
5252
vu8 m_dev5_reg_01F;
53-
vu8 m_dev5_reg_020;
54-
vu8 m_dev5_reg_021;
55-
vu8 m_dev5_reg_022;
56-
vu8 m_dev5_reg_023;
57-
vu8 m_dev5_reg_024;
53+
vu8 m_dev5_reg_020; /* Accessed; Key block 0 data 0 */
54+
vu8 m_dev5_reg_021; /* Accessed; Key block 0 data 1 */
55+
vu8 m_dev5_reg_022; /* Accessed; Key block 0 data 2 */
56+
vu8 m_dev5_reg_023; /* Accessed; Key block 0 data 3 */
57+
vu8 m_dev5_reg_024; /* Accessed; Key block 0 data 4; used as the XOR key when enabled in CDVDreg_DEC */
5858
vu8 m_dev5_reg_025;
5959
vu8 m_dev5_reg_026;
6060
vu8 m_dev5_reg_027;
61-
vu8 m_dev5_reg_028;
62-
vu8 m_dev5_reg_029;
63-
vu8 m_dev5_reg_02A;
64-
vu8 m_dev5_reg_02B;
65-
vu8 m_dev5_reg_02C;
61+
vu8 m_dev5_reg_028; /* Accessed; Key block 1 data 5 */
62+
vu8 m_dev5_reg_029; /* Accessed; Key block 1 data 6 */
63+
vu8 m_dev5_reg_02A; /* Accessed; Key block 1 data 7 */
64+
vu8 m_dev5_reg_02B; /* Accessed; Key block 1 data 8 */
65+
vu8 m_dev5_reg_02C; /* Accessed; Key block 1 data 9 */
6666
vu8 m_dev5_reg_02D;
6767
vu8 m_dev5_reg_02E;
6868
vu8 m_dev5_reg_02F;
69-
vu8 m_dev5_reg_030;
70-
vu8 m_dev5_reg_031;
71-
vu8 m_dev5_reg_032;
72-
vu8 m_dev5_reg_033;
73-
vu8 m_dev5_reg_034;
69+
vu8 m_dev5_reg_030; /* Accessed; Key block 2 data A */
70+
vu8 m_dev5_reg_031; /* Accessed; Key block 2 data B */
71+
vu8 m_dev5_reg_032; /* Accessed; Key block 2 data C */
72+
vu8 m_dev5_reg_033; /* Accessed; Key block 2 data D */
73+
vu8 m_dev5_reg_034; /* Accessed; Key block 2 data E */
7474
vu8 m_dev5_reg_035;
7575
vu8 m_dev5_reg_036;
7676
vu8 m_dev5_reg_037;
77-
vu8 m_dev5_reg_038;
78-
vu8 m_dev5_reg_039;
79-
vu8 m_dev5_reg_03A;
77+
vu8 m_dev5_reg_038; /**< CDVDreg_KEYSTATE */
78+
vu8 m_dev5_reg_039; /**< CDVDreg_KEYXOR */
79+
vu8 m_dev5_reg_03A; /**< CDVDreg_DEC */
8080
} dev5_mmio_hwport_t;
8181

8282
#if !defined(USE_DEV5_MMIO_HWPORT) && defined(_IOP)

iop/network/spduart/src/spduart.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ extern struct irx_export_table _exp_spduart;
2323
// Reference: https://www.freebsd.org/doc/en_US.ISO8859-1/articles/serial-uart/index.html
2424
typedef struct uart16550_regs_
2525
{
26-
u8 r_wrthr_rdrbr;
26+
u8 r_wrthr_rdrbr; /**< write=transmit holding register (THR) / read=receive buffer register (RBR) */
2727
u8 pad01;
28-
u8 r_wrfcr_rdiir;
28+
u8 r_wrfcr_rdiir; /**< write=fifo control register (FCR) / read=interrupt identification register */
2929
u8 pad03;
30-
u8 r_lcr;
30+
u8 r_lcr; /**< line control register (LCR) */
3131
u8 pad05;
32-
u8 r_mcr;
32+
u8 r_mcr; /**< modem control register (MCR) */
3333
u8 pad07;
34-
u8 r_lsr;
34+
u8 r_lsr; /**< line status register (LSR) */
3535
u8 pad09;
36-
u8 r_msr;
36+
u8 r_msr; /**< modem status register (MSR) */
3737
u8 pad0B;
38-
u8 r_scr;
38+
u8 r_scr; /**< scratch register (SCR) */
3939
u8 pad0D;
4040
u8 pad0E;
4141
u8 pad0F;
42-
u8 r_cr1;
42+
u8 r_cr1; /**< control register 1 (CR1) */
4343
u8 pad11;
44-
u8 r_cr2;
44+
u8 r_cr2; /**< control register 2 (CR2) */
4545
u8 pad13;
4646
} uart16550_regs_t;
4747

0 commit comments

Comments
 (0)