dual sramc

sys/pic32/fubarino/Makefile

@@ -6,7 +6,7 @@ S         = ../../../tools/configsys/../../sys/kernel
 vpath %.c $(M):$(S)
 vpath %.S $(M):$(S)
 
-KERNOBJ += _startup.o adc.o clock.o cons.o devsw.o exception.o glcd.o gpio.o init_main.o init_sysent.o kern_clock.o kern_descrip.o kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o kern_subr.o kern_synch.o kern_sysctl.o kern_time.o machdep.o mem.o oc.o rd_sd.o rdisk.o signal.o spi_bus.o subr_prf.o subr_rmap.o swap.o sys_generic.o sys_inode.o sys_pipe.o sys_process.o syscalls.o sysctl.o tty.o tty_subr.o tty_tty.o ufs_alloc.o ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o usb_device.o usb_function_cdc.o usb_uart.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o 
+KERNOBJ += _startup.o adc.o clock.o cons.o devsw.o exception.o gpio.o init_main.o init_sysent.o kern_clock.o kern_descrip.o kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o kern_subr.o kern_synch.o kern_sysctl.o kern_time.o machdep.o mem.o oc.o rd_sd.o rd_sramc.o rdisk.o signal.o spi.o spi_bus.o subr_prf.o subr_rmap.o swap.o sys_generic.o sys_inode.o sys_pipe.o sys_process.o syscalls.o sysctl.o tty.o tty_subr.o tty_tty.o uart.o ufs_alloc.o ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o 
 EXTRA_TARGETS = bootloader 
 
 DEFS += -DADC_ENABLED=YES
@@ -16,11 +16,11 @@ DEFS += -DBL_CRYSTAL=8
 DEFS += -DBL_LED_PIN=5
 DEFS += -DBL_LED_PORT=TRISE
 DEFS += -DBUS_DIV=1
-DEFS += -DBUS_KHZ=80000
-DEFS += -DCONSOLE_DEVICE=ttyUSB0
-DEFS += -DCPU_IDIV=2
-DEFS += -DCPU_KHZ=80000
-DEFS += -DCPU_MUL=20
+DEFS += -DBUS_KHZ=120000
+DEFS += -DCONSOLE_DEVICE=tty1
+DEFS += -DCPU_IDIV=1
+DEFS += -DCPU_KHZ=120000
+DEFS += -DCPU_MUL=15
 DEFS += -DCPU_ODIV=1
 DEFS += -DCRYSTAL=8
 DEFS += -DDC0_DEBUG=DEVCFG0_DEBUG_DISABLED
@@ -35,8 +35,8 @@ DEFS += -DDC1_POSCMOD=DEVCFG1_POSCMOD_HS
 DEFS += -DDC1_SOSC=0
 DEFS += -DDC1_WDTEN=0
 DEFS += -DDC1_WDTPS=DEVCFG1_WDTPS_1
-DEFS += -DDC2_PLLIDIV=DEVCFG2_FPLLIDIV_2
-DEFS += -DDC2_PLLMUL=DEVCFG2_FPLLMUL_20
+DEFS += -DDC2_PLLIDIV=DEVCFG2_FPLLIDIV_1
+DEFS += -DDC2_PLLMUL=DEVCFG2_FPLLMUL_15
 DEFS += -DDC2_PLLODIV=DEVCFG2_FPLLODIV_1
 DEFS += -DDC2_UPLL=0
 DEFS += -DDC2_UPLLIDIV=DEVCFG2_UPLLIDIV_2
@@ -48,7 +48,6 @@ DEFS += -DDC3_USBID=DEVCFG3_FUSBIDIO
 DEFS += -DDC3_USERID=0xffff
 DEFS += -DDC3_VBUSON=DEVCFG3_FVBUSONIO
 DEFS += -DFLASH_JUMP=0x9d000000
-DEFS += -DGLCD_ENABLED=YES
 DEFS += -DGPIO_ENABLED=YES
 DEFS += -DHID_FEATURE_REPORT_BYTES=2
 DEFS += -DHID_INPUT_REPORT_BYTES=2
@@ -56,24 +55,36 @@ DEFS += -DHID_INT_IN_EP_SIZE=64
 DEFS += -DHID_INT_OUT_EP_SIZE=64
 DEFS += -DHID_OUTPUT_REPORT_BYTES=2
 DEFS += -DHID_RPT01_SIZE=29
+DEFS += -DHZ=1000
 DEFS += -DKERNEL
 DEFS += -DLED_KERNEL_PIN=5
 DEFS += -DLED_KERNEL_PORT=TRISE
+DEFS += -DNBUF=8
+DEFS += -DNMOUNT=3
+DEFS += -DNPROC=25
 DEFS += -DOC_ENABLED=YES
+DEFS += -DPARTITION="sramc0:sa@2048,fs@6140"
 DEFS += -DPIC32MX7
 DEFS += -DSD0_CS_PIN=9
 DEFS += -DSD0_CS_PORT=TRISG
+DEFS += -DSD0_MHZ=20
 DEFS += -DSD0_PORT=2
-DEFS += -DUARTUSB_ENABLED=YES
+DEFS += -DSPI_ENABLED=YES
+DEFS += -DSRAMC0_ENABLED=YES
+DEFS += -DSRAMC_ENABLED=YES
+DEFS += -DUART1_BAUD=115200
+DEFS += -DUART1_ENABLED=YES
+DEFS += -DUART2_BAUD=115200
+DEFS += -DUART2_ENABLED=YES
 DEFS += -DUCB_METER
 DEFS += -DUSB_EP0_BUFF_SIZE=8
-DEFS += -DUSB_MAX_EP_NUMBER=3
+DEFS += -DUSB_MAX_EP_NUMBER=1
 DEFS += -DUSB_NUM_STRING_DESCRIPTORS=3
 
 
 LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader.ld
 
-CONFIG = FUBARINO
+CONFIG = FUBARINO-UART2CONS-UART1-SRAMC
 CONFIGPATH = ../../../tools/configsys
 
 include ../../../tools/configsys/../../sys/pic32/kernel-post.mk

sys/pic32/spi_bus.c

@@ -44,12 +44,16 @@ int spi_open(unsigned int bus, unsigned int *tris, unsigned int pin)
         case 2:
             spi_devices[dno].bus = (struct spireg *)&SPI2CON;
             break;
+#ifdef SPI3CON
         case 3:
             spi_devices[dno].bus = (struct spireg *)&SPI3CON;
             break;
+#endif
+#ifdef SPI4CON
         case 4:
             spi_devices[dno].bus = (struct spireg *)&SPI4CON;
             break;
+#endif
         default:
             return -1;
     }
@@ -624,11 +628,14 @@ char *spi_name(int dno)
     if(spi_devices[dno].bus == (struct spireg *)&SPI2CON)
         return "SPI2";
 
+#ifdef SPI3CON
     if(spi_devices[dno].bus == (struct spireg *)&SPI3CON)
         return "SPI3";
-
+#endif
+#ifdef SPI4CON
     if(spi_devices[dno].bus == (struct spireg *)&SPI4CON)
         return "SPI4";
+#endif
 
     return "SPI?";
 }