Remove unneeded CR

This commit is contained in:
Byron Lathi
2023-09-27 23:03:22 -07:00
parent 4925354f53
commit 85f53816f9
8 changed files with 49 additions and 49 deletions

View File

@@ -335,10 +335,10 @@ _start:
@end: bra @end
str: .asciiz "boot2\r\n"
str: .asciiz "boot2\n"
kernel_str: .asciiz "KERNEL O65"
_good: .asciiz "Found KERNEL\r\n"
word_str: .asciiz "Word Value: %x\r\n"
_good: .asciiz "Found KERNEL\n"
word_str: .asciiz "Word Value: %x\n"
opt_str: .asciiz "Opt Len: %x, Opt Type: %x\r\n"
opt_done: .asciiz "Options done. total option length: %x\r\n"
opt_str: .asciiz "Opt Len: %x, Opt Type: %x\n"
opt_done: .asciiz "Options done. total option length: %x\n"

View File

@@ -173,12 +173,12 @@ _main:
@end: bra @end
str: .asciiz "boot\r\n"
str: .asciiz "boot\n"
_boot2_str: .asciiz "BOOT2 BIN"
_fail: .asciiz "not bootloader\r\n"
_good: .asciiz "found bootloader!\r\n"
_cluster: .asciiz "cluster: %lx\r\n"
_addr: .asciiz "addr: %x\r\n"
_fail: .asciiz "not bootloader\n"
_good: .asciiz "found bootloader!\n"
_cluster: .asciiz "cluster: %lx\n"
_addr: .asciiz "addr: %x\n"
_end:
.res (440+_start-_end)

View File

@@ -20,7 +20,7 @@ uint8_t SD_init()
cmdAttempts++;
if(cmdAttempts == CMD0_MAX_ATTEMPTS)
{
cputs("Go IDLE\r\n");
cputs("Go IDLE\n");
return SD_ERROR;
}
}
@@ -30,7 +30,7 @@ uint8_t SD_init()
SD_sendIfCond(res);
if(res[0] != SD_IN_IDLE_STATE)
{
cputs("IF Cond\r\n");
cputs("IF Cond\n");
return SD_ERROR;
}
@@ -44,7 +44,7 @@ uint8_t SD_init()
{
if(cmdAttempts == CMD55_MAX_ATTEMPTS)
{
cputs("op_cond error\r\n");
cputs("op_cond error\n");
return SD_ERROR;
}
@@ -304,7 +304,7 @@ void SD_sendStatus(uint8_t *res)
// while(++readAttempts != SD_MAX_READ_ATTEMPTS)
// if((read = spi_exchange(0xFF)) != 0xFF) break;
// cprintf("read attempts: %d\r\n", readAttempts);
// cprintf("read attempts: %d\n", readAttempts);
// // if response token is 0xFE
// if(read == SD_START_TOKEN)

View File

@@ -13,7 +13,7 @@ void SD_printBuf(uint8_t *buf)
cprintf("%2x", *buf++);
if(colCount == 31)
{
cputs("\r\n");
cputs("\n");
colCount = 0;
}
else
@@ -22,5 +22,5 @@ void SD_printBuf(uint8_t *buf)
colCount++;
}
}
cputs("\r\n");
cputs("\n");
}

View File

@@ -19,16 +19,16 @@ int main() {
uint32_t addr = 0x00000000;
uint16_t i;
cputs("Start\r\n");
cputs("Start\n");
// initialize sd card
if(SD_init() != SD_SUCCESS)
{
cputs("Error\r\n");
cputs("Error\n");
}
else
{
cputs("Success\r\n");
cputs("Success\n");
res[0] = SD_readSingleBlock(addr, buf, &token);
@@ -38,9 +38,9 @@ int main() {
//else if error token received, print
else if(!(token & 0xF0))
{
cputs("Error\r\n");
cputs("Error\n");
} else {
cprintf("bad token: %x\r\n", token);
cprintf("bad token: %x\n", token);
}
__asm__ ("jmp (%v)", buf);

View File

@@ -16,7 +16,7 @@ int main() {
cprintf("%s", string);
cprintf("Here is a long string: %s\r\n", longstring);
cprintf("Here is a long string: %s\n", longstring);
while(1);