godzil/sd2snes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: whitespace cleanup (incomplete)

Browse Source
This commit is contained in:
ikari 2011-02-08 01:01:53 +01:00
parent f34318d2dc
commit ea6e872541
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cic.c
View File

@ -18,7 +18,7 @@ enum cicstates get_cic_state() {
uint32_t count; uint32_t count;
uint32_t togglecount = 0; uint32_t togglecount = 0;
uint8_t state, state_old; uint8_t state, state_old;
state_old = BITBAND(SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT); state_old = BITBAND(SNES_CIC_STATUS_REG->FIOPIN, SNES_CIC_STATUS_BIT);
/* this loop samples at ~10MHz */ /* this loop samples at ~10MHz */
for(count=0; count<1000; count++) { for(count=0; count<1000; count++) {

2
src/fileops.c
View File

@ -32,7 +32,7 @@
/* /*
WCHAR ff_convert(WCHAR w, UINT dir) { WCHAR ff_convert(WCHAR w, UINT dir) {
return w; return w;
}*/ }*/
int newcard; int newcard;

2
src/led.c
View File

@ -94,7 +94,7 @@ void led_pwm() {
BITBAND(LPC_PINCON->PINSEL4, 0) = 1; BITBAND(LPC_PINCON->PINSEL4, 0) = 1;
BITBAND(LPC_PINCON->PINSEL4, 2) = 1; BITBAND(LPC_PINCON->PINSEL4, 2) = 1;
BITBAND(LPC_PINCON->PINSEL4, 4) = 1; BITBAND(LPC_PINCON->PINSEL4, 4) = 1;
BITBAND(LPC_PWM1->PCR, 9) = 1; BITBAND(LPC_PWM1->PCR, 9) = 1;
BITBAND(LPC_PWM1->PCR, 10) = 1; BITBAND(LPC_PWM1->PCR, 10) = 1;
BITBAND(LPC_PWM1->PCR, 11) = 1; BITBAND(LPC_PWM1->PCR, 11) = 1;

14
src/main.c
View File

@ -26,6 +26,7 @@
#include "smc.h" #include "smc.h"
#include "msu1.h" #include "msu1.h"
#include "usb_hid.h"
#define EMC0TOGGLE (3<<4) #define EMC0TOGGLE (3<<4)
#define MR0R (1<<1) #define MR0R (1<<1)
@ -46,7 +47,7 @@ int main(void) {
LPC_GPIO1->FIODIR = 0; LPC_GPIO1->FIODIR = 0;
LPC_GPIO0->FIODIR = BV(16); LPC_GPIO0->FIODIR = BV(16);
/* connect UART3 on P0[25:26] + SSP0 on P0[15:18] SSP1 on P0[6:9] + MAT3.0 on P0[10] */ /* connect UART3 on P0[25:26] + SSP0 on P0[15:18] + MAT3.0 on P0[10] */
LPC_PINCON->PINSEL1 = BV(18) | BV(19) | BV(20) | BV(21) /* UART3 */ LPC_PINCON->PINSEL1 = BV(18) | BV(19) | BV(20) | BV(21) /* UART3 */
| BV(3) | BV(5); /* SSP0 (FPGA) except SS */ | BV(3) | BV(5); /* SSP0 (FPGA) except SS */
LPC_PINCON->PINSEL0 = BV(31); /* SSP0 */ LPC_PINCON->PINSEL0 = BV(31); /* SSP0 */
@ -70,9 +71,9 @@ int main(void) {
led_pwm(); led_pwm();
sdn_init(); sdn_init();
printf("\n\nsd2snes mk.2\n============\nfw ver.: " VER "\ncpu clock: %d Hz\n", CONFIG_CPU_FREQUENCY); printf("\n\nsd2snes mk.2\n============\nfw ver.: " VER "\ncpu clock: %d Hz\n", CONFIG_CPU_FREQUENCY);
printf("PCONP=%lx\n", LPC_SC->PCONP);
file_init(); file_init();
cic_init(0); cic_init(0);
/* setup timer (fpga clk) */ /* setup timer (fpga clk) */
LPC_TIM3->CTCR=0; LPC_TIM3->CTCR=0;
LPC_TIM3->EMR=EMC0TOGGLE; LPC_TIM3->EMR=EMC0TOGGLE;
@ -81,7 +82,7 @@ led_pwm();
LPC_TIM3->TCR=1; LPC_TIM3->TCR=1;
fpga_init(); fpga_init();
fpga_rompgm(); fpga_rompgm();
sram_writebyte(0, SRAM_CMD_ADDR);
while(1) { while(1) {
set_mcu_ovr(1); set_mcu_ovr(1);
if(disk_state == DISK_CHANGED) { if(disk_state == DISK_CHANGED) {
@ -94,8 +95,6 @@ led_pwm();
set_mapper(0x7); set_mapper(0x7);
set_mcu_ovr(0); set_mcu_ovr(0);
snes_reset(0); snes_reset(0);
delay_ms(15); /* allow CIC to settle */
while(get_cic_state() == CIC_FAIL) { while(get_cic_state() == CIC_FAIL) {
rdyled(0); rdyled(0);
readled(0); readled(0);
@ -207,6 +206,7 @@ led_pwm();
printf("test sram\n"); printf("test sram\n");
while(!sram_reliable()); while(!sram_reliable());
printf("ok\n"); printf("ok\n");
//while(1) { //while(1) {
// delay_ms(1000); // delay_ms(1000);
// printf("Estimated SNES master clock: %ld Hz\n", get_snes_sysclk()); // printf("Estimated SNES master clock: %ld Hz\n", get_snes_sysclk());
@ -215,7 +215,7 @@ led_pwm();
//sram_hexdump(SRAM_MENU_ADDR, 0x400); //sram_hexdump(SRAM_MENU_ADDR, 0x400);
while(!cmd) { while(!cmd) {
cmd=menu_main_loop(); cmd=menu_main_loop();
// cmd = 1; // cmd = 1;
printf("cmd: %d\n", cmd); printf("cmd: %d\n", cmd);
sleep_ms(50); sleep_ms(50);
uart_putc('-'); uart_putc('-');
@ -223,7 +223,7 @@ led_pwm();
case SNES_CMD_LOADROM: case SNES_CMD_LOADROM:
get_selected_name(file_lfn); get_selected_name(file_lfn);
set_mcu_ovr(1); set_mcu_ovr(1);
// strcpy((char*)file_lfn, "/msu1/msu1vid_ikari_01/msu1vid.sfc"); // strcpy((char*)file_lfn, "/roms/b/BS Zelda no Densetsu Kodai no Sekiban Dai 1 Hanashi (J).smc");
printf("Selected name: %s\n", file_lfn); printf("Selected name: %s\n", file_lfn);
filesize = load_rom(file_lfn, SRAM_ROM_ADDR); filesize = load_rom(file_lfn, SRAM_ROM_ADDR);
if(romprops.ramsize_bytes) { if(romprops.ramsize_bytes) {