The-Homebrew-Cloud/libfat
2
0
Fork 0
mirror of https://github.com/wiiu-env/libfat.git synced 2024-11-22 18:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed unneeded _NJSD_writeRAM function

Browse Source 
Removed casts for calls to cardWriteCommand
This commit is contained in:
Michael Chisholm 2006-08-06 08:08:21 +00:00
parent 42415d44a4
commit 8ceb43c66c
1 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/disc_io/io_njsd.c
View File

@ -31,6 +31,10 @@
2006-08-05 - Chishm 2006-08-05 - Chishm
* First release * First release
2006-08-06 - Chishm
* Removed unneeded _NJSD_writeRAM function
* Removed casts for calls to cardWriteCommand
*/ */
#include "io_njsd.h" #include "io_njsd.h"
@ -100,20 +104,6 @@ static inline void _NJSD_writeCardCommand
CARD_COMMAND[7] = cmd7; CARD_COMMAND[7] = cmd7;
} }
static void _NJSD_writeRAM (u32 address, u16 value) {
int i;
address <<= 1;
CARD_CR1H = CARD_CR1_ENABLE; // | CARD_CR1_IRQ;
_NJSD_writeCardCommand (0xA0, 0x80, (address>>16) & 0x01, (address>>8) & 0xFF,
(address>>0) & 0xFF, (value>>8) & 0xFF, (value>>0) & 0xFF, 0x00);
CARD_CR2 = _NJSD_cardFlags;
i = COMMAND_TIMEOUT;
while ((CARD_CR2 & CARD_BUSY) && --i);
}
static bool _NJSD_reset (void) { static bool _NJSD_reset (void) {
int i; int i;
CARD_CR1H = CARD_CR1_ENABLE; CARD_CR1H = CARD_CR1_ENABLE;
@ -135,8 +125,6 @@ static bool _NJSD_init (u32 flags) {
irqDisable (IRQ_CARD_LINE); irqDisable (IRQ_CARD_LINE);
_NJSD_writeRAM (0x0000, 0x7E57);
if (! _NJSD_reset() ) { if (! _NJSD_reset() ) {
return false; return false;
} }
@ -532,10 +520,10 @@ bool _NJSD_readSectors (u32 sector, u32 numSectors, void* buffer) {
_NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_DATA, READ_MULTIPLE_BLOCK, sector * BYTES_PER_READ); _NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_DATA, READ_MULTIPLE_BLOCK, sector * BYTES_PER_READ);
for (i = 0; i < numSectors - 2; i++) { for (i = 0; i < numSectors - 2; i++) {
if (((int)buffer & 0x03) != 0){ if (((int)buffer & 0x03) != 0){
cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, _NJSD_read_cmd);
memcpy (tbuf + i * BYTES_PER_READ, tmp, BYTES_PER_READ); memcpy (tbuf + i * BYTES_PER_READ, tmp, BYTES_PER_READ);
} else { } else {
cardPolledTransfer (0xA1406000, (u32*)(tbuf + i * BYTES_PER_READ), BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, (u32*)(tbuf + i * BYTES_PER_READ), BYTES_PER_READ, _NJSD_read_cmd);
} }
if (!_NJSD_waitIRQ ()) { if (!_NJSD_waitIRQ ()) {
#ifdef _NJSD_SYNC #ifdef _NJSD_SYNC
@ -545,10 +533,10 @@ bool _NJSD_readSectors (u32 sector, u32 numSectors, void* buffer) {
} }
} }
if (((int)buffer & 0x03) != 0){ if (((int)buffer & 0x03) != 0){
cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, (u8*)_NJSD_read_end_cmd); cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, _NJSD_read_end_cmd);
memcpy (tbuf + (numSectors - 2) * BYTES_PER_READ, tmp, BYTES_PER_READ); memcpy (tbuf + (numSectors - 2) * BYTES_PER_READ, tmp, BYTES_PER_READ);
} else { } else {
cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 2) * BYTES_PER_READ), BYTES_PER_READ, (u8*)_NJSD_read_end_cmd); cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 2) * BYTES_PER_READ), BYTES_PER_READ, _NJSD_read_end_cmd);
} }
if (!_NJSD_waitIRQ ()) { if (!_NJSD_waitIRQ ()) {
#ifdef _NJSD_SYNC #ifdef _NJSD_SYNC
@ -558,18 +546,18 @@ bool _NJSD_readSectors (u32 sector, u32 numSectors, void* buffer) {
} }
if (((int)buffer & 0x03) != 0){ if (((int)buffer & 0x03) != 0){
cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, _NJSD_read_cmd);
memcpy (tbuf + (numSectors - 1) * BYTES_PER_READ, tmp, BYTES_PER_READ); memcpy (tbuf + (numSectors - 1) * BYTES_PER_READ, tmp, BYTES_PER_READ);
} else { } else {
cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 1) * BYTES_PER_READ), BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 1) * BYTES_PER_READ), BYTES_PER_READ, _NJSD_read_cmd);
} }
} else { } else {
_NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_STREAM, READ_SINGLE_BLOCK, sector * BYTES_PER_READ); _NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_STREAM, READ_SINGLE_BLOCK, sector * BYTES_PER_READ);
if (((int)buffer & 0x03) != 0){ if (((int)buffer & 0x03) != 0){
cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, tmp, BYTES_PER_READ, _NJSD_read_cmd);
memcpy (tbuf, tmp, BYTES_PER_READ); memcpy (tbuf, tmp, BYTES_PER_READ);
} else { } else {
cardPolledTransfer (0xA1406000, (u32*)tbuf, BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, (u32*)tbuf, BYTES_PER_READ, _NJSD_read_cmd);
} }
} }
@ -600,7 +588,7 @@ bool _NJSD_readSectors (u32 sector, u32 numSectors, void* buffer) {
if (numSectors > 1) { if (numSectors > 1) {
_NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_DATA, READ_MULTIPLE_BLOCK, sector * BYTES_PER_READ); _NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_DATA, READ_MULTIPLE_BLOCK, sector * BYTES_PER_READ);
for (i = 0; i < numSectors - 2; i++) { for (i = 0; i < numSectors - 2; i++) {
cardPolledTransfer (0xA1406000, (u32*)(tbuf + i * BYTES_PER_READ), BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, (u32*)(tbuf + i * BYTES_PER_READ), BYTES_PER_READ, _NJSD_read_cmd);
if (!_NJSD_waitIRQ ()) { if (!_NJSD_waitIRQ ()) {
#ifdef _NJSD_SYNC #ifdef _NJSD_SYNC
REG_IME = old_REG_IME; REG_IME = old_REG_IME;
@ -608,7 +596,7 @@ bool _NJSD_readSectors (u32 sector, u32 numSectors, void* buffer) {
return false; return false;
} }
} }
cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 2) * BYTES_PER_READ), BYTES_PER_READ, (u8*)_NJSD_read_end_cmd); cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 2) * BYTES_PER_READ), BYTES_PER_READ, _NJSD_read_end_cmd);
if (!_NJSD_waitIRQ ()) { if (!_NJSD_waitIRQ ()) {
#ifdef _NJSD_SYNC #ifdef _NJSD_SYNC
REG_IME = old_REG_IME; REG_IME = old_REG_IME;
@ -616,10 +604,10 @@ bool _NJSD_readSectors (u32 sector, u32 numSectors, void* buffer) {
return false; return false;
} }
cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 1) * BYTES_PER_READ), BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, (u32*)(tbuf + (numSectors - 1) * BYTES_PER_READ), BYTES_PER_READ, _NJSD_read_cmd);
} else { } else {
_NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_STREAM, READ_SINGLE_BLOCK, sector * BYTES_PER_READ); _NJSD_sendCMDR (_NJSD_speed, NULL, SD_RSP_STREAM, READ_SINGLE_BLOCK, sector * BYTES_PER_READ);
cardPolledTransfer (0xA1406000, (u32*)tbuf, BYTES_PER_READ, (u8*)_NJSD_read_cmd); cardPolledTransfer (0xA1406000, (u32*)tbuf, BYTES_PER_READ, _NJSD_read_cmd);
} }
#ifdef _NJSD_SYNC #ifdef _NJSD_SYNC