diff options
| -rw-r--r-- | bsp/acm32f0x0-nucleo/applications/main.c | 27 | ||||
| -rw-r--r-- | bsp/acm32f0x0-nucleo/drivers/board.h | 1 | ||||
| -rw-r--r-- | bsp/acm32f0x0-nucleo/drivers/led.c | 67 | ||||
| -rw-r--r-- | bsp/acm32f0x0-nucleo/drivers/led.h | 21 | ||||
| -rw-r--r-- | bsp/acm32f0x0-nucleo/project.uvoptx | 222 | ||||
| -rw-r--r-- | bsp/acm32f0x0-nucleo/project.uvprojx | 141 |
6 files changed, 179 insertions, 300 deletions
diff --git a/bsp/acm32f0x0-nucleo/applications/main.c b/bsp/acm32f0x0-nucleo/applications/main.c index 77e1ab1538..2e827e89f2 100644 --- a/bsp/acm32f0x0-nucleo/applications/main.c +++ b/bsp/acm32f0x0-nucleo/applications/main.c @@ -11,34 +11,19 @@ #include <rthw.h> #include <rtthread.h> #include "board.h" +#include <drivers/pin.h> -/******************************************************************************* -* Function Name : assert_failed -* Description : Reports the name of the source file and the source line number -* where the assert error has occurred. -* Input : - file: pointer to the source file name -* - line: assert error line source number -* Output : None -* Return : None -*******************************************************************************/ - -void assert_failed(uint8_t *file, uint32_t line) -{ - rt_kprintf("\n\r Wrong parameter value detected on\r\n"); - rt_kprintf(" file %s\r\n", file); - rt_kprintf(" line %d\r\n", line); - - while (1) ; -} +#define LED_PIN_NUM 1 /* PA1 */ int main(void) { - rt_hw_led_init(); + rt_pin_mode(LED_PIN_NUM, PIN_MODE_OUTPUT); + while(1) { - rt_hw_led_on(0); + rt_pin_write(LED_PIN_NUM, PIN_LOW); rt_thread_delay(RT_TICK_PER_SECOND/2); - rt_hw_led_off(0); + rt_pin_write(LED_PIN_NUM, PIN_HIGH); rt_thread_delay(RT_TICK_PER_SECOND/2); } } diff --git a/bsp/acm32f0x0-nucleo/drivers/board.h b/bsp/acm32f0x0-nucleo/drivers/board.h index 6a37b544fd..39032064cb 100644 --- a/bsp/acm32f0x0-nucleo/drivers/board.h +++ b/bsp/acm32f0x0-nucleo/drivers/board.h @@ -13,7 +13,6 @@ #include <rtconfig.h> #include "ACM32Fxx_HAL.h" -#include "led.h" /*-------------------------- UART CONFIG BEGIN --------------------------*/ diff --git a/bsp/acm32f0x0-nucleo/drivers/led.c b/bsp/acm32f0x0-nucleo/drivers/led.c deleted file mode 100644 index 6574d3fad0..0000000000 --- a/bsp/acm32f0x0-nucleo/drivers/led.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2021-08-23 AisinoChip first implementation - */ - -#include <rtthread.h> -#include "board.h" - -#define led1_gpio GPIOA -#define led1_pin (GPIO_PIN_1) - -void rt_hw_led_init(void) -{ - GPIO_InitTypeDef GPIO_Handle; - - GPIO_Handle.Mode = GPIO_MODE_OUTPUT_PP; - GPIO_Handle.Pull = GPIO_PULLUP; - GPIO_Handle.Alternate = GPIO_FUNCTION_0; - - GPIO_Handle.Pin = led1_pin; - HAL_GPIO_Init(led1_gpio, &GPIO_Handle); -} - -void rt_hw_led_on(rt_uint32_t n) -{ - switch (n) - { - case 0: - HAL_GPIO_WritePin(led1_gpio, led1_pin, GPIO_PIN_SET); - break; - default: - break; - } -} - -void rt_hw_led_off(rt_uint32_t n) -{ - switch (n) - { - case 0: - HAL_GPIO_WritePin(led1_gpio, led1_pin, GPIO_PIN_CLEAR); - break; - default: - break; - } -} - -void rt_hw_led_toggle(rt_uint32_t n) -{ - static rt_bool_t stat = RT_TRUE; - - if (stat == RT_TRUE) - { - rt_hw_led_on(n); - stat = RT_FALSE; - } - else - { - rt_hw_led_off(n); - stat = RT_TRUE; - } -} diff --git a/bsp/acm32f0x0-nucleo/drivers/led.h b/bsp/acm32f0x0-nucleo/drivers/led.h deleted file mode 100644 index 5322e45877..0000000000 --- a/bsp/acm32f0x0-nucleo/drivers/led.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - * 2021-08-25 AisinoChip the first version - */ - -#ifndef __LED_H__ -#define __LED_H__ - -#include <rtthread.h> - -void rt_hw_led_init(void); -void rt_hw_led_on(rt_uint32_t led); -void rt_hw_led_off(rt_uint32_t led); -void rt_hw_led_toggle(rt_uint32_t led); - -#endif diff --git a/bsp/acm32f0x0-nucleo/project.uvoptx b/bsp/acm32f0x0-nucleo/project.uvoptx index 2cf8502141..72665569be 100644 --- a/bsp/acm32f0x0-nucleo/project.uvoptx +++ b/bsp/acm32f0x0-nucleo/project.uvoptx @@ -73,7 +73,7 @@ <LExpSel>0</LExpSel> </OPTXL> <OPTFL> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> @@ -181,7 +181,7 @@ <Group> <GroupName>ACM32_HAL</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -204,8 +204,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>libraries\HAL_Driver\Src\HAL_Uart.c</PathWithFileName> - <FilenameWithoutPath>HAL_Uart.c</FilenameWithoutPath> + <PathWithFileName>libraries\HAL_Driver\Src\HAL_UART.c</PathWithFileName> + <FilenameWithoutPath>HAL_UART.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -309,7 +309,7 @@ <Group> <GroupName>Applications</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -340,8 +340,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\libcpu\arm\common\backtrace.c</PathWithFileName> - <FilenameWithoutPath>backtrace.c</FilenameWithoutPath> + <PathWithFileName>..\..\libcpu\arm\common\div0.c</PathWithFileName> + <FilenameWithoutPath>div0.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -352,8 +352,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\libcpu\arm\common\div0.c</PathWithFileName> - <FilenameWithoutPath>div0.c</FilenameWithoutPath> + <PathWithFileName>..\..\libcpu\arm\common\backtrace.c</PathWithFileName> + <FilenameWithoutPath>backtrace.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -372,24 +372,24 @@ <File> <GroupNumber>3</GroupNumber> <FileNumber>15</FileNumber> - <FileType>1</FileType> + <FileType>2</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\libcpu\arm\cortex-m0\cpuport.c</PathWithFileName> - <FilenameWithoutPath>cpuport.c</FilenameWithoutPath> + <PathWithFileName>..\..\libcpu\arm\cortex-m0\context_rvds.S</PathWithFileName> + <FilenameWithoutPath>context_rvds.S</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>3</GroupNumber> <FileNumber>16</FileNumber> - <FileType>2</FileType> + <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\libcpu\arm\cortex-m0\context_rvds.S</PathWithFileName> - <FilenameWithoutPath>context_rvds.S</FilenameWithoutPath> + <PathWithFileName>..\..\libcpu\arm\cortex-m0\cpuport.c</PathWithFileName> + <FilenameWithoutPath>cpuport.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -456,8 +456,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\waitqueue.c</PathWithFileName> - <FilenameWithoutPath>waitqueue.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\workqueue.c</PathWithFileName> + <FilenameWithoutPath>workqueue.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -468,8 +468,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\workqueue.c</PathWithFileName> - <FilenameWithoutPath>workqueue.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\completion.c</PathWithFileName> + <FilenameWithoutPath>completion.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -480,8 +480,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\ringbuffer.c</PathWithFileName> - <FilenameWithoutPath>ringbuffer.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\waitqueue.c</PathWithFileName> + <FilenameWithoutPath>waitqueue.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -492,8 +492,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\dataqueue.c</PathWithFileName> - <FilenameWithoutPath>dataqueue.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\ringblk_buf.c</PathWithFileName> + <FilenameWithoutPath>ringblk_buf.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -504,8 +504,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\pipe.c</PathWithFileName> - <FilenameWithoutPath>pipe.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\dataqueue.c</PathWithFileName> + <FilenameWithoutPath>dataqueue.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -516,8 +516,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\completion.c</PathWithFileName> - <FilenameWithoutPath>completion.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\ringbuffer.c</PathWithFileName> + <FilenameWithoutPath>ringbuffer.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -528,8 +528,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\drivers\src\ringblk_buf.c</PathWithFileName> - <FilenameWithoutPath>ringblk_buf.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\drivers\src\pipe.c</PathWithFileName> + <FilenameWithoutPath>pipe.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -549,7 +549,7 @@ <Group> <GroupName>Drivers</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -560,8 +560,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>drivers\drv_gpio.c</PathWithFileName> - <FilenameWithoutPath>drv_gpio.c</FilenameWithoutPath> + <PathWithFileName>drivers\board.c</PathWithFileName> + <FilenameWithoutPath>board.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -572,8 +572,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>drivers\board.c</PathWithFileName> - <FilenameWithoutPath>board.c</FilenameWithoutPath> + <PathWithFileName>drivers\drv_wdt.c</PathWithFileName> + <FilenameWithoutPath>drv_wdt.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -584,8 +584,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>drivers\drv_adc.c</PathWithFileName> - <FilenameWithoutPath>drv_adc.c</FilenameWithoutPath> + <PathWithFileName>drivers\drv_hwtimer.c</PathWithFileName> + <FilenameWithoutPath>drv_hwtimer.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -608,8 +608,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>drivers\drv_hwtimer.c</PathWithFileName> - <FilenameWithoutPath>drv_hwtimer.c</FilenameWithoutPath> + <PathWithFileName>drivers\drv_adc.c</PathWithFileName> + <FilenameWithoutPath>drv_adc.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -620,20 +620,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>drivers\led.c</PathWithFileName> - <FilenameWithoutPath>led.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>5</GroupNumber> - <FileNumber>35</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>drivers\drv_wdt.c</PathWithFileName> - <FilenameWithoutPath>drv_wdt.c</FilenameWithoutPath> + <PathWithFileName>drivers\drv_gpio.c</PathWithFileName> + <FilenameWithoutPath>drv_gpio.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -647,7 +635,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -659,7 +647,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -671,7 +659,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -683,7 +671,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -695,7 +683,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -707,19 +695,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>41</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>..\..\components\finsh\finsh_token.c</PathWithFileName> - <FilenameWithoutPath>finsh_token.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>6</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -731,7 +707,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -743,7 +719,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -755,7 +731,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -767,7 +743,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -779,19 +755,19 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\components\finsh\msh.c</PathWithFileName> - <FilenameWithoutPath>msh.c</FilenameWithoutPath> + <PathWithFileName>..\..\components\finsh\finsh_token.c</PathWithFileName> + <FilenameWithoutPath>finsh_token.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -801,6 +777,18 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>6</GroupNumber> + <FileNumber>47</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\..\components\finsh\msh.c</PathWithFileName> + <FilenameWithoutPath>msh.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -811,13 +799,25 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> + <FileNumber>48</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\..\src\components.c</PathWithFileName> + <FilenameWithoutPath>components.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>7</GroupNumber> <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\scheduler.c</PathWithFileName> - <FilenameWithoutPath>scheduler.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\timer.c</PathWithFileName> + <FilenameWithoutPath>timer.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -840,8 +840,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\irq.c</PathWithFileName> - <FilenameWithoutPath>irq.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\idle.c</PathWithFileName> + <FilenameWithoutPath>idle.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -852,8 +852,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\device.c</PathWithFileName> - <FilenameWithoutPath>device.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\scheduler.c</PathWithFileName> + <FilenameWithoutPath>scheduler.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -864,8 +864,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\timer.c</PathWithFileName> - <FilenameWithoutPath>timer.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\thread.c</PathWithFileName> + <FilenameWithoutPath>thread.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -876,8 +876,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\mempool.c</PathWithFileName> - <FilenameWithoutPath>mempool.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\irq.c</PathWithFileName> + <FilenameWithoutPath>irq.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -888,8 +888,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\clock.c</PathWithFileName> - <FilenameWithoutPath>clock.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\object.c</PathWithFileName> + <FilenameWithoutPath>object.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -900,8 +900,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\components.c</PathWithFileName> - <FilenameWithoutPath>components.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\kservice.c</PathWithFileName> + <FilenameWithoutPath>kservice.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -912,8 +912,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\mem.c</PathWithFileName> - <FilenameWithoutPath>mem.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\mempool.c</PathWithFileName> + <FilenameWithoutPath>mempool.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -924,8 +924,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\thread.c</PathWithFileName> - <FilenameWithoutPath>thread.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\mem.c</PathWithFileName> + <FilenameWithoutPath>mem.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -936,8 +936,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\kservice.c</PathWithFileName> - <FilenameWithoutPath>kservice.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\clock.c</PathWithFileName> + <FilenameWithoutPath>clock.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -948,20 +948,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\..\src\idle.c</PathWithFileName> - <FilenameWithoutPath>idle.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>7</GroupNumber> - <FileNumber>61</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>..\..\src\object.c</PathWithFileName> - <FilenameWithoutPath>object.c</FilenameWithoutPath> + <PathWithFileName>..\..\src\device.c</PathWithFileName> + <FilenameWithoutPath>device.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -975,7 +963,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -987,7 +975,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -999,7 +987,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1011,7 +999,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1023,7 +1011,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> diff --git a/bsp/acm32f0x0-nucleo/project.uvprojx b/bsp/acm32f0x0-nucleo/project.uvprojx index 6c37e5fbb5..19b89df9c9 100644 --- a/bsp/acm32f0x0-nucleo/project.uvprojx +++ b/bsp/acm32f0x0-nucleo/project.uvprojx @@ -389,9 +389,9 @@ <FilePath>libraries\HAL_Driver\Src\HAL_IWDT.c</FilePath> </File> <File> - <FileName>HAL_Uart.c</FileName> + <FileName>HAL_UART.c</FileName> <FileType>1</FileType> - <FilePath>libraries\HAL_Driver\Src\HAL_Uart.c</FilePath> + <FilePath>libraries\HAL_Driver\Src\HAL_UART.c</FilePath> </File> <File> <FileName>HAL_EXTI.c</FileName> @@ -449,30 +449,30 @@ <GroupName>CPU</GroupName> <Files> <File> - <FileName>backtrace.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath> - </File> - <File> <FileName>div0.c</FileName> <FileType>1</FileType> <FilePath>..\..\libcpu\arm\common\div0.c</FilePath> </File> <File> - <FileName>showmem.c</FileName> + <FileName>backtrace.c</FileName> <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\common\showmem.c</FilePath> + <FilePath>..\..\libcpu\arm\common\backtrace.c</FilePath> </File> <File> - <FileName>cpuport.c</FileName> + <FileName>showmem.c</FileName> <FileType>1</FileType> - <FilePath>..\..\libcpu\arm\cortex-m0\cpuport.c</FilePath> + <FilePath>..\..\libcpu\arm\common\showmem.c</FilePath> </File> <File> <FileName>context_rvds.S</FileName> <FileType>2</FileType> <FilePath>..\..\libcpu\arm\cortex-m0\context_rvds.S</FilePath> </File> + <File> + <FileName>cpuport.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\libcpu\arm\cortex-m0\cpuport.c</FilePath> + </File> </Files> </Group> <Group> @@ -499,39 +499,39 @@ <FilePath>..\..\components\drivers\serial\serial.c</FilePath> </File> <File> - <FileName>waitqueue.c</FileName> + <FileName>workqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\waitqueue.c</FilePath> + <FilePath>..\..\components\drivers\src\workqueue.c</FilePath> </File> <File> - <FileName>workqueue.c</FileName> + <FileName>completion.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\workqueue.c</FilePath> + <FilePath>..\..\components\drivers\src\completion.c</FilePath> </File> <File> - <FileName>ringbuffer.c</FileName> + <FileName>waitqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath> + <FilePath>..\..\components\drivers\src\waitqueue.c</FilePath> </File> <File> - <FileName>dataqueue.c</FileName> + <FileName>ringblk_buf.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath> + <FilePath>..\..\components\drivers\src\ringblk_buf.c</FilePath> </File> <File> - <FileName>pipe.c</FileName> + <FileName>dataqueue.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\pipe.c</FilePath> + <FilePath>..\..\components\drivers\src\dataqueue.c</FilePath> </File> <File> - <FileName>completion.c</FileName> + <FileName>ringbuffer.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\completion.c</FilePath> + <FilePath>..\..\components\drivers\src\ringbuffer.c</FilePath> </File> <File> - <FileName>ringblk_buf.c</FileName> + <FileName>pipe.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\drivers\src\ringblk_buf.c</FilePath> + <FilePath>..\..\components\drivers\src\pipe.c</FilePath> </File> <File> <FileName>watchdog.c</FileName> @@ -544,39 +544,34 @@ <GroupName>Drivers</GroupName> <Files> <File> - <FileName>drv_gpio.c</FileName> - <FileType>1</FileType> - <FilePath>drivers\drv_gpio.c</FilePath> - </File> - <File> <FileName>board.c</FileName> <FileType>1</FileType> <FilePath>drivers\board.c</FilePath> </File> <File> - <FileName>drv_adc.c</FileName> + <FileName>drv_wdt.c</FileName> <FileType>1</FileType> - <FilePath>drivers\drv_adc.c</FilePath> + <FilePath>drivers\drv_wdt.c</FilePath> </File> <File> - <FileName>drv_uart.c</FileName> + <FileName>drv_hwtimer.c</FileName> <FileType>1</FileType> - <FilePath>drivers\drv_uart.c</FilePath> + <FilePath>drivers\drv_hwtimer.c</FilePath> </File> <File> - <FileName>drv_hwtimer.c</FileName> + <FileName>drv_uart.c</FileName> <FileType>1</FileType> - <FilePath>drivers\drv_hwtimer.c</FilePath> + <FilePath>drivers\drv_uart.c</FilePath> </File> <File> - <FileName>led.c</FileName> + <FileName>drv_adc.c</FileName> <FileType>1</FileType> - <FilePath>drivers\led.c</FilePath> + <FilePath>drivers\drv_adc.c</FilePath> </File> <File> - <FileName>drv_wdt.c</FileName> + <FileName>drv_gpio.c</FileName> <FileType>1</FileType> - <FilePath>drivers\drv_wdt.c</FilePath> + <FilePath>drivers\drv_gpio.c</FilePath> </File> </Files> </Group> @@ -609,11 +604,6 @@ <FilePath>..\..\components\finsh\shell.c</FilePath> </File> <File> - <FileName>finsh_token.c</FileName> - <FileType>1</FileType> - <FilePath>..\..\components\finsh\finsh_token.c</FilePath> - </File> - <File> <FileName>finsh_var.c</FileName> <FileType>1</FileType> <FilePath>..\..\components\finsh\finsh_var.c</FilePath> @@ -639,84 +629,89 @@ <FilePath>..\..\components\finsh\finsh_error.c</FilePath> </File> <File> - <FileName>msh.c</FileName> + <FileName>finsh_token.c</FileName> <FileType>1</FileType> - <FilePath>..\..\components\finsh\msh.c</FilePath> + <FilePath>..\..\components\finsh\finsh_token.c</FilePath> </File> <File> <FileName>finsh_init.c</FileName> <FileType>1</FileType> <FilePath>..\..\components\finsh\finsh_init.c</FilePath> </File> + <File> + <FileName>msh.c</FileName> + <FileType>1</FileType> + <FilePath>..\..\components\finsh\msh.c</FilePath> + </File> </Files> </Group> <Group> <GroupName>Kernel</GroupName> <Files> <File> - <FileName>scheduler.c</FileName> + <FileName>components.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\scheduler.c</FilePath> + <FilePath>..\..\src\components.c</FilePath> </File> <File> - <FileName>ipc.c</FileName> + <FileName>timer.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\ipc.c</FilePath> + <FilePath>..\..\src\timer.c</FilePath> </File> <File> - <FileName>irq.c</FileName> + <FileName>ipc.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\irq.c</FilePath> + <FilePath>..\..\src\ipc.c</FilePath> </File> <File> - <FileName>device.c</FileName> + <FileName>idle.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\device.c</FilePath> + <FilePath>..\..\src\idle.c</FilePath> </File> <File> - <FileName>timer.c</FileName> + <FileName>scheduler.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\timer.c</FilePath> + <FilePath>..\..\src\scheduler.c</FilePath> </File> <File> - <FileName>mempool.c</FileName> + <FileName>thread.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\mempool.c</FilePath> + <FilePath>..\..\src\thread.c</FilePath> </File> <File> - <FileName>clock.c</FileName> + <FileName>irq.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\clock.c</FilePath> + <FilePath>..\..\src\irq.c</FilePath> </File> <File> - <FileName>components.c</FileName> + <FileName>object.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\components.c</FilePath> + <FilePath>..\..\src\object.c</FilePath> </File> <File> - <FileName>mem.c</FileName> + <FileName>kservice.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\mem.c</FilePath> + <FilePath>..\..\src\kservice.c</FilePath> </File> <File> - <FileName>thread.c</FileName> + <FileName>mempool.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\thread.c</FilePath> + <FilePath>..\..\src\mempool.c</FilePath> </File> <File> - <FileName>kservice.c</FileName> + <FileName>mem.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\kservice.c</FilePath> + <FilePath>..\..\src\mem.c</FilePath> </File> <File> - <FileName>idle.c</FileName> + <FileName>clock.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\idle.c</FilePath> + <FilePath>..\..\src\clock.c</FilePath> </File> <File> - <FileName>object.c</FileName> + <FileName>device.c</FileName> <FileType>1</FileType> - <FilePath>..\..\src\object.c</FilePath> + <FilePath>..\..\src\device.c</FilePath> </File> </Files> </Group> |