OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt
  • R/O
  • SSH
  • HTTPS

chibios: Commit


Commit MetaInfo

Revisão14902 (tree)
Hora2021-10-12 21:04:21
Autorgdisirio

Mensagem de Log

(mensagem de log vazia)

Mudança Sumário

Diff

--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/halconf.h (revision 14901)
+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/halconf.h (revision 14902)
@@ -142,7 +142,7 @@
142142 * @brief Enables the SERIAL subsystem.
143143 */
144144 #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
145-#define HAL_USE_SERIAL FALSE
145+#define HAL_USE_SERIAL TRUE
146146 #endif
147147
148148 /**
@@ -156,7 +156,7 @@
156156 * @brief Enables the SIO subsystem.
157157 */
158158 #if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
159-#define HAL_USE_SIO TRUE
159+#define HAL_USE_SIO FALSE
160160 #endif
161161
162162 /**
--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/mcuconf.h (revision 14901)
+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/cfg/mcuconf.h (revision 14902)
@@ -309,7 +309,7 @@
309309 #define STM32_SERIAL_USE_USART3 FALSE
310310 #define STM32_SERIAL_USE_UART4 FALSE
311311 #define STM32_SERIAL_USE_UART5 FALSE
312-#define STM32_SERIAL_USE_LPUART1 FALSE
312+#define STM32_SERIAL_USE_LPUART1 TRUE
313313
314314 /*
315315 * SIO driver system settings.
@@ -319,7 +319,7 @@
319319 #define STM32_SIO_USE_USART3 FALSE
320320 #define STM32_SIO_USE_UART4 FALSE
321321 #define STM32_SIO_USE_UART5 FALSE
322-#define STM32_SIO_USE_LPUART1 TRUE
322+#define STM32_SIO_USE_LPUART1 FALSE
323323
324324 /*
325325 * SPI driver system settings.
--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/main.c (revision 14901)
+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_DYNAMIC/main.c (revision 14902)
@@ -33,21 +33,21 @@
3333 .code_region = 0U,
3434 .data_region = 1U,
3535 .regions = {
36- {
36+ [0] = {
3737 (uint32_t)&__flash1_base__, (uint32_t)&__flash1_end__, false
3838 },
39- {
39+ [1] = {
4040 (uint32_t)&__ram1_base__, (uint32_t)&__ram1_end__, true
4141 }
4242 },
4343 .mpuregs = {
44- {
44+ [0] = {
4545 (uint32_t)&__flash1_base__, MPU_RASR_ATTR_AP_RO_RO |
4646 MPU_RASR_ATTR_CACHEABLE_WT_NWA |
4747 MPU_RASR_SIZE_32K |
4848 MPU_RASR_ENABLE
4949 },
50- {
50+ [1] = {
5151 (uint32_t)&__ram1_base__, MPU_RASR_ATTR_AP_RW_RW |
5252 MPU_RASR_ATTR_CACHEABLE_WB_WA |
5353 MPU_RASR_SIZE_4K |
@@ -54,9 +54,9 @@
5454 MPU_RASR_ENABLE
5555 }
5656 },
57- .stdin_stream = (SandboxStream *)&LPSIOD1,
58- .stdout_stream = (SandboxStream *)&LPSIOD1,
59- .stderr_stream = (SandboxStream *)&LPSIOD1
57+ .stdin_stream = (SandboxStream *)&LPSD1,
58+ .stdout_stream = (SandboxStream *)&LPSD1,
59+ .stderr_stream = (SandboxStream *)&LPSD1
6060 };
6161
6262 /* Sandbox 2 configuration.*/
@@ -64,21 +64,21 @@
6464 .code_region = 0U,
6565 .data_region = 1U,
6666 .regions = {
67- {
67+ [0] = {
6868 (uint32_t)&__flash2_base__, (uint32_t)&__flash2_end__, false
6969 },
70- {
70+ [1] = {
7171 (uint32_t)&__ram2_base__, (uint32_t)&__ram2_end__, true
7272 }
7373 },
7474 .mpuregs = {
75- {
75+ [0] = {
7676 (uint32_t)&__flash2_base__, MPU_RASR_ATTR_AP_RO_RO |
7777 MPU_RASR_ATTR_CACHEABLE_WT_NWA |
7878 MPU_RASR_SIZE_32K |
7979 MPU_RASR_ENABLE
8080 },
81- {
81+ [1] = {
8282 (uint32_t)&__ram2_base__, MPU_RASR_ATTR_AP_RW_RW |
8383 MPU_RASR_ATTR_CACHEABLE_WB_WA |
8484 MPU_RASR_SIZE_4K |
@@ -85,9 +85,9 @@
8585 MPU_RASR_ENABLE
8686 }
8787 },
88- .stdin_stream = (SandboxStream *)&LPSIOD1,
89- .stdout_stream = (SandboxStream *)&LPSIOD1,
90- .stderr_stream = (SandboxStream *)&LPSIOD1
88+ .stdin_stream = (SandboxStream *)&LPSD1,
89+ .stdout_stream = (SandboxStream *)&LPSD1,
90+ .stderr_stream = (SandboxStream *)&LPSD1
9191 };
9292
9393 /* Sandbox objects.*/
@@ -142,10 +142,9 @@
142142 chEvtRegister(&sb.termination_es, &el1, (eventid_t)0);
143143
144144 /*
145- * Activates the Serial or SIO driver using the default configuration.
145+ * Activates the Serial driver using the default configuration.
146146 */
147- sioStart(&LPSIOD1, NULL);
148- sioStartOperation(&LPSIOD1, NULL);
147+ sdStart(&LPSD1, NULL);
149148
150149 /*
151150 * Creates the blinker thread.
@@ -176,8 +175,8 @@
176175
177176 /* Checking for user button, launching test suite if pressed.*/
178177 if (palReadLine(LINE_BUTTON)) {
179- test_execute((BaseSequentialStream *)&LPSIOD1, &rt_test_suite);
180- test_execute((BaseSequentialStream *)&LPSIOD1, &oslib_test_suite);
178+ test_execute((BaseSequentialStream *)&LPSD1, &rt_test_suite);
179+ test_execute((BaseSequentialStream *)&LPSD1, &oslib_test_suite);
181180 }
182181
183182 /* Waiting for a sandbox event or timeout.*/
@@ -184,11 +183,11 @@
184183 if (chEvtWaitOneTimeout(ALL_EVENTS, TIME_MS2I(500)) != (eventmask_t)0) {
185184
186185 if (chThdTerminatedX(utp1)) {
187- chprintf((BaseSequentialStream *)&LPSIOD1, "SB1 terminated\r\n");
186+ chprintf((BaseSequentialStream *)&LPSD1, "SB1 terminated\r\n");
188187 }
189188
190189 if (chThdTerminatedX(utp2)) {
191- chprintf((BaseSequentialStream *)&LPSIOD1, "SB2 terminated\r\n");
190+ chprintf((BaseSequentialStream *)&LPSD1, "SB2 terminated\r\n");
192191 }
193192 }
194193 }
--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/cfg/halconf.h (revision 14901)
+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/cfg/halconf.h (revision 14902)
@@ -142,7 +142,7 @@
142142 * @brief Enables the SERIAL subsystem.
143143 */
144144 #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
145-#define HAL_USE_SERIAL FALSE
145+#define HAL_USE_SERIAL TRUE
146146 #endif
147147
148148 /**
@@ -156,7 +156,7 @@
156156 * @brief Enables the SIO subsystem.
157157 */
158158 #if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
159-#define HAL_USE_SIO TRUE
159+#define HAL_USE_SIO FALSE
160160 #endif
161161
162162 /**
--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/cfg/mcuconf.h (revision 14901)
+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/cfg/mcuconf.h (revision 14902)
@@ -309,7 +309,7 @@
309309 #define STM32_SERIAL_USE_USART3 FALSE
310310 #define STM32_SERIAL_USE_UART4 FALSE
311311 #define STM32_SERIAL_USE_UART5 FALSE
312-#define STM32_SERIAL_USE_LPUART1 FALSE
312+#define STM32_SERIAL_USE_LPUART1 TRUE
313313
314314 /*
315315 * SIO driver system settings.
@@ -319,7 +319,7 @@
319319 #define STM32_SIO_USE_USART3 FALSE
320320 #define STM32_SIO_USE_UART4 FALSE
321321 #define STM32_SIO_USE_UART5 FALSE
322-#define STM32_SIO_USE_LPUART1 TRUE
322+#define STM32_SIO_USE_LPUART1 FALSE
323323
324324 /*
325325 * SPI driver system settings.
--- trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c (revision 14901)
+++ trunk/demos/STM32/RT-STM32G474RE-NUCLEO64-SB_HOST_STATIC/main.c (revision 14902)
@@ -33,12 +33,16 @@
3333 .code_region = 0U,
3434 .data_region = 1U,
3535 .regions = {
36- {(uint32_t)&__flash1_base__, (uint32_t)&__flash1_end__, false},
37- {(uint32_t)&__ram1_base__, (uint32_t)&__ram1_end__, true}
36+ [0] = {
37+ (uint32_t)&__flash1_base__, (uint32_t)&__flash1_end__, false
38+ },
39+ [1] = {
40+ (uint32_t)&__ram1_base__, (uint32_t)&__ram1_end__, true
41+ }
3842 },
39- .stdin_stream = (SandboxStream *)&LPSIOD1,
40- .stdout_stream = (SandboxStream *)&LPSIOD1,
41- .stderr_stream = (SandboxStream *)&LPSIOD1
43+ .stdin_stream = (SandboxStream *)&LPSD1,
44+ .stdout_stream = (SandboxStream *)&LPSD1,
45+ .stderr_stream = (SandboxStream *)&LPSD1
4246 };
4347
4448 /* Sandbox 2 configuration.*/
@@ -46,12 +50,16 @@
4650 .code_region = 0U,
4751 .data_region = 1U,
4852 .regions = {
49- {(uint32_t)&__flash2_base__, (uint32_t)&__flash2_end__, false},
50- {(uint32_t)&__ram2_base__, (uint32_t)&__ram2_end__, true}
53+ [0] = {
54+ (uint32_t)&__flash2_base__, (uint32_t)&__flash2_end__, false
55+ },
56+ [1] = {
57+ (uint32_t)&__ram2_base__, (uint32_t)&__ram2_end__, true
58+ }
5159 },
52- .stdin_stream = (SandboxStream *)&LPSIOD1,
53- .stdout_stream = (SandboxStream *)&LPSIOD1,
54- .stderr_stream = (SandboxStream *)&LPSIOD1
60+ .stdin_stream = (SandboxStream *)&LPSD1,
61+ .stdout_stream = (SandboxStream *)&LPSD1,
62+ .stderr_stream = (SandboxStream *)&LPSD1
5563 };
5664
5765 /* Sandbox objects.*/
@@ -106,10 +114,9 @@
106114 chEvtRegister(&sb.termination_es, &el1, (eventid_t)0);
107115
108116 /*
109- * Activates the Serial or SIO driver using the default configuration.
117+ * Activates the Serial driver using the default configuration.
110118 */
111- sioStart(&LPSIOD1, NULL);
112- sioStartOperation(&LPSIOD1, NULL);
119+ sdStart(&LPSD1, NULL);
113120
114121 /*
115122 * Creates the blinker thread.
@@ -158,8 +165,8 @@
158165
159166 /* Checking for user button, launching test suite if pressed.*/
160167 if (palReadLine(LINE_BUTTON)) {
161- test_execute((BaseSequentialStream *)&LPSIOD1, &rt_test_suite);
162- test_execute((BaseSequentialStream *)&LPSIOD1, &oslib_test_suite);
168+ test_execute((BaseSequentialStream *)&LPSD1, &rt_test_suite);
169+ test_execute((BaseSequentialStream *)&LPSD1, &oslib_test_suite);
163170 }
164171
165172 /* Waiting for a sandbox event or timeout.*/
@@ -166,11 +173,11 @@
166173 if (chEvtWaitOneTimeout(ALL_EVENTS, TIME_MS2I(500)) != (eventmask_t)0) {
167174
168175 if (chThdTerminatedX(utp1)) {
169- chprintf((BaseSequentialStream *)&LPSIOD1, "SB1 terminated\r\n");
176+ chprintf((BaseSequentialStream *)&LPSD1, "SB1 terminated\r\n");
170177 }
171178
172179 if (chThdTerminatedX(utp2)) {
173- chprintf((BaseSequentialStream *)&LPSIOD1, "SB2 terminated\r\n");
180+ chprintf((BaseSequentialStream *)&LPSD1, "SB2 terminated\r\n");
174181 }
175182 }
176183 }
--- trunk/os/sb/host/sbhost.h (revision 14901)
+++ trunk/os/sb/host/sbhost.h (revision 14902)
@@ -111,9 +111,7 @@
111111 /**
112112 * @brief MPU regions initialization values.
113113 * @note Regions initialization values must be chosen to be
114- * functionally equivalent to the values in the "regions"
115- * field.
116- *
114+ * consistent with the values in the "regions" field.
117115 */
118116 mpureg_t mpuregs[SB_NUM_REGIONS];
119117 #endif
Show on old repository browser