LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Forgot about this

Browse Source
This commit is contained in:
Aurora 2016-09-12 13:19:59 +02:00
parent da0adeb39e
commit 4367ea6afa
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
exceptions/arm9/source/i2c.c
View File

@ -79,7 +79,7 @@ static inline void i2cWaitBusy(u8 bus_id)
while (*i2cGetCntReg(bus_id) & 0x80); while (*i2cGetCntReg(bus_id) & 0x80);
} }
static inline u32 i2cGetResult(u8 bus_id) static inline bool i2cGetResult(u8 bus_id)
{ {
i2cWaitBusy(bus_id); i2cWaitBusy(bus_id);
@ -95,7 +95,7 @@ static void i2cStop(u8 bus_id, u8 arg0)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static u32 i2cSelectDevice(u8 bus_id, u8 dev_reg) static bool i2cSelectDevice(u8 bus_id, u8 dev_reg)
{ {
i2cWaitBusy(bus_id); i2cWaitBusy(bus_id);
*i2cGetDataReg(bus_id) = dev_reg; *i2cGetDataReg(bus_id) = dev_reg;
@ -104,7 +104,7 @@ static u32 i2cSelectDevice(u8 bus_id, u8 dev_reg)
return i2cGetResult(bus_id); return i2cGetResult(bus_id);
} }
static u32 i2cSelectRegister(u8 bus_id, u8 reg) static bool i2cSelectRegister(u8 bus_id, u8 reg)
{ {
i2cWaitBusy(bus_id); i2cWaitBusy(bus_id);
*i2cGetDataReg(bus_id) = reg; *i2cGetDataReg(bus_id) = reg;
@ -115,7 +115,7 @@ static u32 i2cSelectRegister(u8 bus_id, u8 reg)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
u32 i2cWriteRegister(u8 dev_id, u8 reg, u8 data) bool i2cWriteRegister(u8 dev_id, u8 reg, u8 data)
{ {
u8 bus_id = i2cGetDeviceBusId(dev_id); u8 bus_id = i2cGetDeviceBusId(dev_id);
u8 dev_addr = i2cGetDeviceRegAddr(dev_id); u8 dev_addr = i2cGetDeviceRegAddr(dev_id);
@ -129,12 +129,11 @@ u32 i2cWriteRegister(u8 dev_id, u8 reg, u8 data)
*i2cGetCntReg(bus_id) = 0xC1; *i2cGetCntReg(bus_id) = 0xC1;
i2cStop(bus_id, 0); i2cStop(bus_id, 0);
if(i2cGetResult(bus_id)) if(i2cGetResult(bus_id)) return true;
return 1;
} }
*i2cGetCntReg(bus_id) = 0xC5; *i2cGetCntReg(bus_id) = 0xC5;
i2cWaitBusy(bus_id); i2cWaitBusy(bus_id);
} }
return 0; return false;
} }

2
exceptions/arm9/source/i2c.h
View File

@ -41,4 +41,4 @@
#define I2C_DEV_GYRO 10 #define I2C_DEV_GYRO 10
#define I2C_DEV_IR 13 #define I2C_DEV_IR 13
u32 i2cWriteRegister(u8 dev_id, u8 reg, u8 data); bool i2cWriteRegister(u8 dev_id, u8 reg, u8 data);

2
source/emunand.c
View File

@ -31,7 +31,7 @@ void locateEmuNand(u32 *emuHeader, FirmwareSource *nandType)
const u32 nandSize = getMMCDevice(0)->total_size; const u32 nandSize = getMMCDevice(0)->total_size;
bool found = false; bool found = false;
for (u32 i = 0; i < 3 && !found; i++) for(u32 i = 0; i < 3 && !found; i++)
{ {
u32 nandOffset; u32 nandOffset;
switch(i) switch(i)