diff --git a/bsp/lm3s/board.h b/bsp/lm3s/board.h index 33d328546551dc6b70f783ef1f17aae95b010aa0..f33af86d26ee8145361f81232506c1a3b8556318 100644 --- a/bsp/lm3s/board.h +++ b/bsp/lm3s/board.h @@ -23,7 +23,7 @@ #define LM3S_SRAM_END (0x20000000 + LM3S_SRAM_SIZE * 1024) // For lm3s8962, it should be SYSCTL_XTAL_8MHZ -#define LM3S_XTAL_TYPE SYSCTL_XTAL_6MHZ +#define LM3S_XTAL_TYPE SYSCTL_XTAL_8MHZ void rt_hw_board_led_on(int n); void rt_hw_board_led_off(int n); diff --git a/bsp/lm3s/project_lwip_dfs.Opt b/bsp/lm3s/project_lwip_dfs.Opt index d0c72b4f401253d8ec854d12384db8abf86b1ac5..b8023b799babf45452e4064bfbe0967795d00ae5 100644 --- a/bsp/lm3s/project_lwip_dfs.Opt +++ b/bsp/lm3s/project_lwip_dfs.Opt @@ -16,7 +16,7 @@ GRPOPT 2,(Kernel),0,0,0 GRPOPT 3,(finsh),0,0,0 GRPOPT 4,(LM3S),0,0,0 GRPOPT 5,(driverlib),0,0,0 -GRPOPT 6,(Filesystem),0,0,0 +GRPOPT 6,(Filesystem),1,0,0 GRPOPT 7,(LwIP),0,0,0 OPTFFF 1,1,1,0,0,25,25,0,<.\application.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,236,2,0,0,123,1,0,0 } @@ -61,55 +61,54 @@ OPTFFF 4,39,1,0,0,0,0,0,<..\..\libcpu\arm\lm3s\serial.c> OPTFFF 4,40,1,0,0,0,0,0,<..\..\libcpu\arm\lm3s\fault.c> OPTFFF 4,41,2,0,0,0,0,0,<..\..\libcpu\arm\lm3s\fault_rvds.S> OPTFFF 5,42,4,0,0,0,0,0,<..\..\bsp\lm3s\Libraries\driverlib\rvmdk\driverlib.lib> -OPTFFF 6,43,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_init.c> -OPTFFF 6,44,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_fs.c> -OPTFFF 6,45,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_raw.c> -OPTFFF 6,46,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_util.c> -OPTFFF 6,47,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_posix.c> -OPTFFF 6,48,1,0,0,0,0,0,<..\..\components\dfs\filesystems\elmfat\ff.c> -OPTFFF 6,49,1,0,0,0,0,0,<..\..\components\dfs\filesystems\elmfat\dfs_elm.c> -OPTFFF 7,50,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\dhcp.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,227,2,0,0,108,1,0,0 } -OPTFFF 7,51,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\dns.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,248,0,0,0 } -OPTFFF 7,52,1,0,0,247,247,0,<..\..\components\net\lwip\src\core\init.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,42,1,0,0 } -OPTFFF 7,53,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\netif.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,22,0,0,0,29,0,0,0,161,2,0,0,21,1,0,0 } -OPTFFF 7,54,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\pbuf.c> -OPTFFF 7,55,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\raw.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,44,0,0,0,58,0,0,0,183,2,0,0,50,1,0,0 } -OPTFFF 7,56,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\stats.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,66,0,0,0,87,0,0,0,205,2,0,0,79,1,0,0 } -OPTFFF 7,57,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\sys.c> -OPTFFF 7,58,1,1006632960,0,3,7,0,<..\..\components\net\lwip\src\core\tcp.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,227,2,0,0,158,1,0,0 } -OPTFFF 7,59,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\tcp_in.c> -OPTFFF 7,60,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\tcp_out.c> -OPTFFF 7,61,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\udp.c> -OPTFFF 7,62,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\autoip.c> -OPTFFF 7,63,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\icmp.c> -OPTFFF 7,64,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\igmp.c> -OPTFFF 7,65,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\inet.c> -OPTFFF 7,66,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\inet_chksum.c> -OPTFFF 7,67,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\ip.c> -OPTFFF 7,68,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\ip_addr.c> -OPTFFF 7,69,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\ip_frag.c> -OPTFFF 7,70,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\msg_in.c> -OPTFFF 7,71,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\msg_out.c> -OPTFFF 7,72,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\api_lib.c> -OPTFFF 7,73,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\api_msg.c> -OPTFFF 7,74,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\err.c> -OPTFFF 7,75,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\netbuf.c> -OPTFFF 7,76,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\netdb.c> -OPTFFF 7,77,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\netifapi.c> -OPTFFF 7,78,1,603979776,0,257,257,0,<..\..\components\net\lwip\src\api\tcpip.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,192,2,0,0,253,0,0,0 } -OPTFFF 7,79,1,0,0,0,0,0,<..\..\components\net\lwip\src\netif\etharp.c> -OPTFFF 7,80,1,16777216,0,208,212,0,<..\..\components\net\lwip\src\netif\ethernetif.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,66,0,0,0,87,0,0,0,2,3,0,0,84,1,0,0 } -OPTFFF 7,81,1,0,0,0,0,0,<..\..\components\net\lwip\src\netif\loopif.c> -OPTFFF 7,82,1,0,0,0,0,0,<..\..\components\net\lwip\src\arch\sys_arch_init.c> -OPTFFF 7,83,1,0,0,0,0,0,<..\..\components\net\lwip\src\arch\sys_arch.c> -OPTFFF 7,84,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\sockets.c> -OPTFFF 7,85,1,503316480,0,350,359,0,<..\..\components\net\lwip\src\core\memp.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,44,0,0,0,58,0,0,0,205,2,0,0,47,1,0,0 } -OPTFFF 7,86,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\asn1_dec.c> -OPTFFF 7,87,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\asn1_enc.c> -OPTFFF 7,88,1,285212672,0,4104,4104,0,<..\..\components\net\lwip\src\core\snmp\mib2.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,183,2,0,0,172,0,0,0 } -OPTFFF 7,89,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\mib_structs.c> +OPTFFF 6,43,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_fs.c> +OPTFFF 6,44,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_posix.c> +OPTFFF 6,45,1,0,0,0,0,0,<..\..\components\dfs\filesystems\elmfat\ff.c> +OPTFFF 6,46,1,0,0,0,0,0,<..\..\components\dfs\filesystems\elmfat\dfs_elm.c> +OPTFFF 6,47,1,0,0,0,0,0,<..\..\components\dfs\src\dfs.c> +OPTFFF 6,48,1,0,0,0,0,0,<..\..\components\dfs\src\dfs_file.c> +OPTFFF 7,49,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\dhcp.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,227,2,0,0,108,1,0,0 } +OPTFFF 7,50,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\dns.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,248,0,0,0 } +OPTFFF 7,51,1,0,0,247,247,0,<..\..\components\net\lwip\src\core\init.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,139,2,0,0,42,1,0,0 } +OPTFFF 7,52,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\netif.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,22,0,0,0,29,0,0,0,161,2,0,0,21,1,0,0 } +OPTFFF 7,53,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\pbuf.c> +OPTFFF 7,54,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\raw.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,44,0,0,0,58,0,0,0,183,2,0,0,50,1,0,0 } +OPTFFF 7,55,1,0,0,1,1,0,<..\..\components\net\lwip\src\core\stats.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,66,0,0,0,87,0,0,0,205,2,0,0,79,1,0,0 } +OPTFFF 7,56,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\sys.c> +OPTFFF 7,57,1,1006632960,0,3,7,0,<..\..\components\net\lwip\src\core\tcp.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,227,2,0,0,158,1,0,0 } +OPTFFF 7,58,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\tcp_in.c> +OPTFFF 7,59,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\tcp_out.c> +OPTFFF 7,60,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\udp.c> +OPTFFF 7,61,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\autoip.c> +OPTFFF 7,62,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\icmp.c> +OPTFFF 7,63,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\igmp.c> +OPTFFF 7,64,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\inet.c> +OPTFFF 7,65,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\inet_chksum.c> +OPTFFF 7,66,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\ip.c> +OPTFFF 7,67,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\ip_addr.c> +OPTFFF 7,68,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\ipv4\ip_frag.c> +OPTFFF 7,69,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\msg_in.c> +OPTFFF 7,70,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\msg_out.c> +OPTFFF 7,71,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\api_lib.c> +OPTFFF 7,72,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\api_msg.c> +OPTFFF 7,73,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\err.c> +OPTFFF 7,74,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\netbuf.c> +OPTFFF 7,75,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\netdb.c> +OPTFFF 7,76,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\netifapi.c> +OPTFFF 7,77,1,603979776,0,257,257,0,<..\..\components\net\lwip\src\api\tcpip.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,192,2,0,0,253,0,0,0 } +OPTFFF 7,78,1,0,0,0,0,0,<..\..\components\net\lwip\src\netif\etharp.c> +OPTFFF 7,79,1,16777216,0,208,212,0,<..\..\components\net\lwip\src\netif\ethernetif.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,66,0,0,0,87,0,0,0,2,3,0,0,84,1,0,0 } +OPTFFF 7,80,1,0,0,0,0,0,<..\..\components\net\lwip\src\netif\loopif.c> +OPTFFF 7,81,1,0,0,0,0,0,<..\..\components\net\lwip\src\arch\sys_arch_init.c> +OPTFFF 7,82,1,0,0,0,0,0,<..\..\components\net\lwip\src\arch\sys_arch.c> +OPTFFF 7,83,1,0,0,0,0,0,<..\..\components\net\lwip\src\api\sockets.c> +OPTFFF 7,84,1,503316480,0,350,359,0,<..\..\components\net\lwip\src\core\memp.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,44,0,0,0,58,0,0,0,205,2,0,0,47,1,0,0 } +OPTFFF 7,85,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\asn1_dec.c> +OPTFFF 7,86,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\asn1_enc.c> +OPTFFF 7,87,1,285212672,0,4104,4104,0,<..\..\components\net\lwip\src\core\snmp\mib2.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,0,0,0,0,0,0,0,0,183,2,0,0,172,0,0,0 } +OPTFFF 7,88,1,0,0,0,0,0,<..\..\components\net\lwip\src\core\snmp\mib_structs.c> -ExtF 79,87,0,{ 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,205,2,0,0,159,1,0,0 } +ExtF 83,101,0,{ 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,226,255,255,255,88,0,0,0,116,0,0,0,205,2,0,0,159,1,0,0 } TARGOPT 1, (RT-Thread-LM3S) ADSCLK=6000000 diff --git a/bsp/lm3s/sdcard.c b/bsp/lm3s/sdcard.c index 7699efe51e0411d6ff25dbf269b8b6475b1d6aa4..d4a5e96a68a6c883476552c451833cff859b018f 100644 --- a/bsp/lm3s/sdcard.c +++ b/bsp/lm3s/sdcard.c @@ -93,8 +93,8 @@ typedef enum { #define SDC_SSI_PINS (SDC_SSI_TX | SDC_SSI_RX | SDC_SSI_CLK) // GPIO for card chip select -#define SDC_CS_GPIO_PORT_BASE GPIO_PORTD_BASE -#define SDC_CS_GPIO_SYSCTL_PERIPH SYSCTL_PERIPH_GPIOD +#define SDC_CS_GPIO_PORT_BASE GPIO_PORTG_BASE +#define SDC_CS_GPIO_SYSCTL_PERIPH SYSCTL_PERIPH_GPIOG #define SDC_CS GPIO_PIN_0 // asserts the CS pin to the card