Fcalva/gint
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/gint.git synced 2024-12-28 04:23:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ubc: slight cleanup

Browse source 
It is guaranteed by the driver model that drivers are powered on when
gint is active. Sharing the driver isn't too useful because we can't
remote debug in the OS world anyway, there's no USB driver there.
This commit is contained in:
Lephe 2024-03-27 20:53:41 +01:00
parent faead4bc1d
commit 4623d790cc
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/gint/mpu/ubc.h
View file

@ -22,13 +22,15 @@ typedef volatile struct
uint32_t SZ :3; /* Operand Size Select */ uint32_t SZ :3; /* Operand Size Select */
uint32_t :4; uint32_t :4;
uint32_t CD :2; /* Bus Select */ uint32_t CD :2; /* Bus Select */
uint32_t ID :2; /* Instruction Fetch / Operand Access Select */ uint32_t ID :2; /* Ins. Fetch / Operand Access Select */
uint32_t :1; uint32_t :1;
uint32_t RW :2; /* Bus Command Select */ uint32_t RW :2; /* Bus Command Select */
uint32_t CE :1; /* Channel Enable */ uint32_t CE :1; /* Channel Enable */
); );
lword_union(CRR0, /* Match operation setting 0 */ lword_union(CRR0, /* Match operation setting 0 */
uint32_t :30; uint32_t :18;
uint32_t _1 :1; /* Always set to 1 */
uint32_t :11;
uint32_t PCB :1; /* PC Break Select */ uint32_t PCB :1; /* PC Break Select */
uint32_t BIE :1; /* Break Enable */ uint32_t BIE :1; /* Break Enable */
); );
@ -36,7 +38,6 @@ typedef volatile struct
uint32_t CAMR0; /* Match address mask setting 0 */ uint32_t CAMR0; /* Match address mask setting 0 */
pad(0x10); pad(0x10);
lword_union(CBR1, /* Match condition setting 1 */ lword_union(CBR1, /* Match condition setting 1 */
uint32_t MFE :1; /* Match Flag Enable */ uint32_t MFE :1; /* Match Flag Enable */
uint32_t AIE :1; /* ASID Enable */ uint32_t AIE :1; /* ASID Enable */
@ -47,13 +48,15 @@ typedef volatile struct
uint32_t ETBE :1; /* Execution Count Value Enable */ uint32_t ETBE :1; /* Execution Count Value Enable */
uint32_t :3; uint32_t :3;
uint32_t CD :2; /* Bus Select */ uint32_t CD :2; /* Bus Select */
uint32_t ID :2; /* Instruction Fetch / Operand Access Select */ uint32_t ID :2; /* Ins. Fetch / Operand Access Select */
uint32_t :1; uint32_t :1;
uint32_t RW :2; /* Bus Command Select */ uint32_t RW :2; /* Bus Command Select */
uint32_t CE :1; /* Channel Enable */ uint32_t CE :1; /* Channel Enable */
); );
lword_union(CRR1, /* Match operation setting 1 */ lword_union(CRR1, /* Match operation setting 1 */
uint32_t :30; uint32_t :18;
uint32_t _1 :1; /* Always set to 1 */
uint32_t :11;
uint32_t PCB :1; /* PC Break Select */ uint32_t PCB :1; /* PC Break Select */
uint32_t BIE :1; /* Break Enable */ uint32_t BIE :1; /* Break Enable */
); );

9
src/ubc/ubc.c
View file

@ -55,9 +55,6 @@ static void hpoweroff(void)
} while (0) } while (0)
bool ubc_set_breakpoint(int channel, void* break_address, ubc_break_mode_t break_mode) bool ubc_set_breakpoint(int channel, void* break_address, ubc_break_mode_t break_mode)
{ {
if (!hpowered())
hpoweron();
uint32_t pcb = break_mode == UBC_BREAK_AFTER ? 1 : 0; uint32_t pcb = break_mode == UBC_BREAK_AFTER ? 1 : 0;
if (channel == 0) { if (channel == 0) {
UBC_BREAK_CHANNEL(CBR0, CRR0, CAR0, CAMR0); UBC_BREAK_CHANNEL(CBR0, CRR0, CAR0, CAMR0);
@ -73,9 +70,6 @@ bool ubc_set_breakpoint(int channel, void* break_address, ubc_break_mode_t break
bool ubc_get_break_address(int channel, void** break_address) bool ubc_get_break_address(int channel, void** break_address)
{ {
if (!hpowered())
hpoweron();
if (channel == 0 && UBC.CBR0.CE) { if (channel == 0 && UBC.CBR0.CE) {
*break_address = (void*) UBC.CAR0; *break_address = (void*) UBC.CAR0;
return true; return true;
@ -89,9 +83,6 @@ bool ubc_get_break_address(int channel, void** break_address)
bool ubc_disable_channel(int channel) bool ubc_disable_channel(int channel)
{ {
if (!hpowered())
hpoweron();
if (channel == 0) { if (channel == 0) {
UBC.CBR0.CE = 0; UBC.CBR0.CE = 0;
return true; return true;