svn commit: r56272 - /dev/incubator/nuttx/KEYS
Author: btashton Date: Sun Aug 14 02:25:16 2022 New Revision: 56272 Log: nuttx: Add new signing key for btash...@apache.org Modified: dev/incubator/nuttx/KEYS Modified: dev/incubator/nuttx/KEYS == --- dev/incubator/nuttx/KEYS (original) +++ dev/incubator/nuttx/KEYS Sun Aug 14 02:25:16 2022 @@ -400,3 +400,44 @@ Ry/NvVpdxOXdIX/35HsCKQnWCkP55NkfSeBW05bo hfAeYixxQip1A5obhfNr4Ue7 =0HV0 -END PGP PUBLIC KEY BLOCK- +pub ed25519 2022-08-13 [SC] [expires: 2024-08-12] + E6ECA9BA49003B2A246FD9866E72660F995FBC42 +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-13 Brennan Ashton +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [S] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub cv25519 2022-08-14 [E] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [A] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton + +-BEGIN PGP PUBLIC KEY BLOCK- + +mDMEYvg45xYJKwYBBAHaRw8BAQdAn+DPguDU8tLrOuicKQESzhTZ3bFjLPVF9QXl +4veLw1y0KkJyZW5uYW4gQXNodG9uIDxiYXNodG9uQGJyZW5uYW5hc2h0b24uY29t +PoidBBMWCgBFAhsDBQkDwmcABQsJCAcCAyICAQYVCgkICwIEFgIDAQIeBwIXgBYh +BObsqbpJADsqJG/Zhm5yZg+ZX7xCBQJi+DrkAhkBAAoJEG5yZg+ZX7xCRKoBAIBm +Ungvmrr+dhn67yfEfsHUAjRBpc/Wx2DxAXVuq+c3AQD2gkLMANnM1limnuYEcCyP +vw6qbrwpOXPzHSj/hfTmDLQkQnJlbm5hbiBBc2h0b24gPGJ0YXNodG9uQGFwYWNo +ZS5vcmc+iJoEExYKAEIWIQTm7Km6SQA7KiRv2YZucmYPmV+8QgUCYvg+kwIbAwUJ +A8JnAAULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcCF4AACgkQbnJmD5lfvEKdvQEA +vK1gY8cRJiDUWy7Z189mKfOaEDk6aBwtkralhPPqhRkBAPUkynFuSePrLrUo8Sya +IUaUozljxKhloY3OBngyg/MGuDMEYvg7+BYJKwYBBAHaRw8BAQdA1b+3iSG6XWGC +kKcr5v1B6bqYS6TNGPuYIZayOmYZOJyI9QQYFgoAJhYhBObsqbpJADsqJG/Zhm5y +Zg+ZX7xCBQJi+Dv4AhsCBQkDwmcAAIEJEG5yZg+ZX7xCdiAEGRYKAB0WIQRrbf/Z +Q0IyJcLL6wn20bLEj1euvgUCYvg7+AAKCRD20bLEj1euvrttAQDbjjqpVLQx5oQ+ +1OAIkQIxd4BDf9qhmwoNV5Xg1XdNfgEA4xNNPH2SQUtpPY+g+E90jVqZN0Fx/xnm +TU3VFCYmAgRaoQEAqHqE+iVERXiYI9f/z5BnQpR37ddBtzP+ghNdQPoQ+xYBAKQx +JDrD03CfdOGymrgyk3NbgspZgCvM0uAY/3Ivx+QAuDgEYvg8FxIKKwYBBAGXVQEF +AQEHQGoxz+L6ViiWz4TvsMEjoC5wx1B2gJgVuifVbEtEUnIGAwEIB4h+BBgWCgAm +FiEE5uypukkAOyokb9mGbnJmD5lfvEIFAmL4PBcCGwwFCQPCZwAACgkQbnJmD5lf +vEJg7AEAgQxVDme244fbCIF7FcJA+Kn9KbvzmwdqjLSEclxHPWYBAK9Scqtdm/0R +ZczPGB8PCh7MSR/o3pKs1kaEFT7leOwOuDMEYvg8LRYJKwYBBAHaRw8BAQdA0k36 +19k0Yful7WGI82JcoguqovzRqwmmPFeHYRiUSyuIfgQYFgoAJhYhBObsqbpJADsq +JG/Zhm5yZg+ZX7xCBQJi+DwtAhsgBQkDwmcAAAoJEG5yZg+ZX7xC7wsA/0tGWKqU +zfkT+Ylv8txMCRoMTbByBR2ORI++XeQ7XYuHAQC3gq6TKnUWP5Zoer+DZYOfZ3t7 +JEIBhZo5M3xHPE1fAg== +=TOEH +-END PGP PUBLIC KEY BLOCK-
svn commit: r56271 - in /release/incubator/nuttx: ./ 10.0.1/ 9.1.1/
Author: btashton Date: Sun Aug 14 02:13:28 2022 New Revision: 56271 Log: nuttx: Add new signing key for btash...@apache.org Modified: release/incubator/nuttx/10.0.1/apache-nuttx-10.0.1-incubating.tar.gz.asc release/incubator/nuttx/10.0.1/apache-nuttx-apps-10.0.1-incubating.tar.gz.asc release/incubator/nuttx/9.1.1/apache-nuttx-9.1.1-incubating.tar.gz.asc release/incubator/nuttx/9.1.1/apache-nuttx-apps-9.1.1-incubating.tar.gz.asc release/incubator/nuttx/KEYS Modified: release/incubator/nuttx/10.0.1/apache-nuttx-10.0.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/10.0.1/apache-nuttx-apps-10.0.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/9.1.1/apache-nuttx-9.1.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/9.1.1/apache-nuttx-apps-9.1.1-incubating.tar.gz.asc == Binary files - no diff available. Modified: release/incubator/nuttx/KEYS == --- release/incubator/nuttx/KEYS (original) +++ release/incubator/nuttx/KEYS Sun Aug 14 02:13:28 2022 @@ -400,3 +400,44 @@ Ry/NvVpdxOXdIX/35HsCKQnWCkP55NkfSeBW05bo hfAeYixxQip1A5obhfNr4Ue7 =0HV0 -END PGP PUBLIC KEY BLOCK- +pub ed25519 2022-08-13 [SC] [expires: 2024-08-12] + E6ECA9BA49003B2A246FD9866E72660F995FBC42 +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-13 Brennan Ashton +uid [ultimate] Brennan Ashton +sig 36E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [S] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub cv25519 2022-08-14 [E] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton +sub ed25519 2022-08-14 [A] [expires: 2024-08-13] +sig 6E72660F995FBC42 2022-08-14 Brennan Ashton + +-BEGIN PGP PUBLIC KEY BLOCK- + +mDMEYvg45xYJKwYBBAHaRw8BAQdAn+DPguDU8tLrOuicKQESzhTZ3bFjLPVF9QXl +4veLw1y0KkJyZW5uYW4gQXNodG9uIDxiYXNodG9uQGJyZW5uYW5hc2h0b24uY29t +PoidBBMWCgBFAhsDBQkDwmcABQsJCAcCAyICAQYVCgkICwIEFgIDAQIeBwIXgBYh +BObsqbpJADsqJG/Zhm5yZg+ZX7xCBQJi+DrkAhkBAAoJEG5yZg+ZX7xCRKoBAIBm +Ungvmrr+dhn67yfEfsHUAjRBpc/Wx2DxAXVuq+c3AQD2gkLMANnM1limnuYEcCyP +vw6qbrwpOXPzHSj/hfTmDLQkQnJlbm5hbiBBc2h0b24gPGJ0YXNodG9uQGFwYWNo +ZS5vcmc+iJoEExYKAEIWIQTm7Km6SQA7KiRv2YZucmYPmV+8QgUCYvg+kwIbAwUJ +A8JnAAULCQgHAgMiAgEGFQoJCAsCBBYCAwECHgcCF4AACgkQbnJmD5lfvEKdvQEA +vK1gY8cRJiDUWy7Z189mKfOaEDk6aBwtkralhPPqhRkBAPUkynFuSePrLrUo8Sya +IUaUozljxKhloY3OBngyg/MGuDMEYvg7+BYJKwYBBAHaRw8BAQdA1b+3iSG6XWGC +kKcr5v1B6bqYS6TNGPuYIZayOmYZOJyI9QQYFgoAJhYhBObsqbpJADsqJG/Zhm5y +Zg+ZX7xCBQJi+Dv4AhsCBQkDwmcAAIEJEG5yZg+ZX7xCdiAEGRYKAB0WIQRrbf/Z +Q0IyJcLL6wn20bLEj1euvgUCYvg7+AAKCRD20bLEj1euvrttAQDbjjqpVLQx5oQ+ +1OAIkQIxd4BDf9qhmwoNV5Xg1XdNfgEA4xNNPH2SQUtpPY+g+E90jVqZN0Fx/xnm +TU3VFCYmAgRaoQEAqHqE+iVERXiYI9f/z5BnQpR37ddBtzP+ghNdQPoQ+xYBAKQx +JDrD03CfdOGymrgyk3NbgspZgCvM0uAY/3Ivx+QAuDgEYvg8FxIKKwYBBAGXVQEF +AQEHQGoxz+L6ViiWz4TvsMEjoC5wx1B2gJgVuifVbEtEUnIGAwEIB4h+BBgWCgAm +FiEE5uypukkAOyokb9mGbnJmD5lfvEIFAmL4PBcCGwwFCQPCZwAACgkQbnJmD5lf +vEJg7AEAgQxVDme244fbCIF7FcJA+Kn9KbvzmwdqjLSEclxHPWYBAK9Scqtdm/0R +ZczPGB8PCh7MSR/o3pKs1kaEFT7leOwOuDMEYvg8LRYJKwYBBAHaRw8BAQdA0k36 +19k0Yful7WGI82JcoguqovzRqwmmPFeHYRiUSyuIfgQYFgoAJhYhBObsqbpJADsq +JG/Zhm5yZg+ZX7xCBQJi+DwtAhsgBQkDwmcAAAoJEG5yZg+ZX7xC7wsA/0tGWKqU +zfkT+Ylv8txMCRoMTbByBR2ORI++XeQ7XYuHAQC3gq6TKnUWP5Zoer+DZYOfZ3t7 +JEIBhZo5M3xHPE1fAg== +=TOEH +-END PGP PUBLIC KEY BLOCK-
[GitHub] [incubator-nuttx] btashton commented on pull request #6850: Added support for Raspberry Pi Pico W
btashton commented on PR #6850: URL: https://github.com/apache/incubator-nuttx/pull/6850#issuecomment-1214251383 Ouch that firmware there is problematic as well. @jerpelea FYI. What we have done for other chips like this including the esp32 is fetch required blobs at build time from these SDKs or similar. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] curuvar commented on pull request #6850: Added support for Raspberry Pi Pico W
curuvar commented on PR #6850: URL: https://github.com/apache/incubator-nuttx/pull/6850#issuecomment-1214246787 Would it be acceptable to include a utility to automatically generate this file from pico-sdk so that it would not need to be added to the repository itself? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] curuvar commented on pull request #6850: Added support for Raspberry Pi Pico W
curuvar commented on PR #6850: URL: https://github.com/apache/incubator-nuttx/pull/6850#issuecomment-1214246189 It comes from pico-sdk which allows its uses with Raspberry Pi chips (which is why it was in the Raspberry Pi Pico directory tree. I believe the actual code comes originally from Broadcom or Infineon. I followed the same idea as for other Broadcom based chips in: boards/arm/stm32/photon/src/stm32_wlan_firmware.c -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] btashton commented on pull request #6850: Added support for Raspberry Pi Pico W
btashton commented on PR #6850: URL: https://github.com/apache/incubator-nuttx/pull/6850#issuecomment-1214244581 This PR includes the wifi firmware blob here [boards/arm/rp2040/raspberrypi-pico-w/src/rp2040_wlan_firmware.c](https://github.com/apache/incubator-nuttx/pull/6850/files#diff-f9f413ed2d4566aba5136875d262acd8fe0aaeb749ba20a8d2d4a32fbd070a76) which We cannot be including in this repo. Where does this come from? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] curuvar opened a new pull request, #6850: Added support for Raspberry Pi Pico W
curuvar opened a new pull request, #6850: URL: https://github.com/apache/incubator-nuttx/pull/6850 ## Summary Added support for Raspberry Pi Pico W, and refactored some Raspberry Pi code to eliminate duplication of basic initialization software. _**NOTE:**_ This Pull includes "Added gSPI mode for Infineon CYW43439 WiFi chip. #6845" as the gSPI code is needed to support the Pico W's networking capability. ## Impact With the exception of the included gSPI code, nothing should impact the operation of other chips. ## Testing Have tested the Pico-W in general and the Pico-w WiFi access using telnet, telnetd, ping and renew. I can also control the on-board LED which is driven by the CYW43439 chip. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[incubator-nuttx] branch master updated: arch: qemu-rv: Fix high CPU usage in SMP mode
This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new 548540eb13 arch: qemu-rv: Fix high CPU usage in SMP mode 548540eb13 is described below commit 548540eb13345e4cca9af7b25daae94fa6374fe2 Author: Masayuki Ishikawa AuthorDate: Sat Aug 13 22:33:52 2022 +0900 arch: qemu-rv: Fix high CPU usage in SMP mode Summary: - I noticed that QEMU shows high CPU usage if the number of CPUs does not match the kernel configuration. (e.g. -smp 8 and CONFIG_SMP_NCPUS=2) - This commit fixes this issue. Impact: - qemu-rv only Testing: - Tested with the following configs - rv-virt:smp64 (CONFIG_NCPUS=1/2/8) - rv-virt:nsh64 Signed-off-by: Masayuki Ishikawa --- arch/risc-v/src/qemu-rv/qemu_rv_head.S | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_head.S b/arch/risc-v/src/qemu-rv/qemu_rv_head.S index ebfe5d1c68..f55ec9a30b 100644 --- a/arch/risc-v/src/qemu-rv/qemu_rv_head.S +++ b/arch/risc-v/src/qemu-rv/qemu_rv_head.S @@ -52,13 +52,21 @@ __start: j2f 1: - /* In case of single CPU config, stop here */ + /* Load the number of CPUs that the kernel supports */ -#if !defined(CONFIG_SMP) || (CONFIG_SMP_NCPUS == 1) +#ifdef CONFIG_SMP + li t1, CONFIG_SMP_NCPUS +#else + li t1, 1 +#endif + + /* If a0 (mhartid) >= t1 (the number of CPUs), stop here */ + + blt a0, t1, 3f csrw mie, zero wfi -#endif +3: /* To get g_cpu_basestack[mhartid], must get g_cpu_basestack first */ la t0, g_cpu_basestack
[GitHub] [incubator-nuttx] pkarashchenko merged pull request #6848: arch: qemu-rv: Fix high CPU usage in SMP mode
pkarashchenko merged PR #6848: URL: https://github.com/apache/incubator-nuttx/pull/6848 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] pkarashchenko commented on pull request #6848: arch: qemu-rv: Fix high CPU usage in SMP mode
pkarashchenko commented on PR #6848: URL: https://github.com/apache/incubator-nuttx/pull/6848#issuecomment-1214212713 Let's ignore the error and see if the build pass on mainline -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] pkarashchenko commented on pull request #6848: arch: qemu-rv: Fix high CPU usage in SMP mode
pkarashchenko commented on PR #6848: URL: https://github.com/apache/incubator-nuttx/pull/6848#issuecomment-1214212536 @masayuki2009 I tried to restart CI multiple times, but the error persists -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] diegoherranz commented on pull request #6849: drivers/leds/ws2812: Revert SPI frequency change
diegoherranz commented on PR #6849: URL: https://github.com/apache/incubator-nuttx/pull/6849#issuecomment-1214190424 Thanks -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[incubator-nuttx] branch master updated: drivers/leds/ws2812: Revert SPI frequency change
This is an automated email from the ASF dual-hosted git repository. btashton pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git The following commit(s) were added to refs/heads/master by this push: new e1e89b925f drivers/leds/ws2812: Revert SPI frequency change e1e89b925f is described below commit e1e89b925fc7bf6a66f85ce5853ab3a9101eae05 Author: Diego Herranz AuthorDate: Sat Aug 13 17:33:10 2022 +0200 drivers/leds/ws2812: Revert SPI frequency change https://github.com/apache/incubator-nuttx/commit/0c3db448bb64c8877a4dfa62416027b24a639a8e added the option to generate the waveforms to drive ws2812 and similar LEDs using different hardware (e.g. RP2040 PIO instead of SPI). For that new mode, the concept of CONFIG_WS2812_FREQUENCY is different. Instead of the SPI frequency (commonly a few MHz), it is the frequency of the actual output waveform (commonly 400 or 800 kHz). There was an attempt to express the SPI frequency divided by 10, but it's not actually the case either (it would be divided by 8). I think it is clearer to explain in Kconfig what CONFIG_WS2812_FREQUENCY means for each mode and go back to the previous behaviour for the original SPI mode (also to avoid breaking out-of-tree boards). --- drivers/leds/Kconfig | 12 drivers/leds/ws2812.c | 8 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index ad23a4ca94..f2525a81ea 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -148,9 +148,13 @@ config WS2812_FREQUENCY default 80 depends on WS2812 ---help--- - This is should be set to the bit frequency of the - ws2812s being used. Newer chips use an 800 kHz - bit frequency (the default); although, some older - chips run at 400 kHz. + Frequency in Hz. + On SPI mode (WS2812_NON_SPI_DRIVER not selected), this is + the SPI frequency (commonly a few MHz) to generate the required + waveforms to represent a 0/1 symbol. + On non SPI mode (WS2812_NON_SPI_DRIVER selected), this should be set + to the bit frequency of the ws2812s being used. Newer chips use an + 800 kHz bit frequency (the default); although, some older chips run + at 400 kHz. endmenu # LED Support diff --git a/drivers/leds/ws2812.c b/drivers/leds/ws2812.c index 0919d3f500..f47fd2e61b 100644 --- a/drivers/leds/ws2812.c +++ b/drivers/leds/ws2812.c @@ -78,10 +78,10 @@ * Reset: low signal >50us */ -#if CONFIG_WS2812_FREQUENCY >= 36 && CONFIG_WS2812_FREQUENCY <= 50 +#if CONFIG_WS2812_FREQUENCY >= 360 && CONFIG_WS2812_FREQUENCY <= 500 # define WS2812_ZERO_BYTE 0b0100 /* 200ns at 5 MHz, 278ns at 3.6 MHz */ # define WS2812_ONE_BYTE 0b0111 /* 600ns at 5 MHz, 833ns at 3.6 MHz */ -#elif CONFIG_WS2812_FREQUENCY >= 59 && CONFIG_WS2812_FREQUENCY <= 90 +#elif CONFIG_WS2812_FREQUENCY >= 590 && CONFIG_WS2812_FREQUENCY <= 900 # define WS2812_ZERO_BYTE 0b0110 /* 222ns at 9 MHz, 339ns at 5.9 MHz */ # define WS2812_ONE_BYTE 0b0100 /* 556ns at 9 MHz, 847ns at 5.9 MHz */ #else @@ -93,7 +93,7 @@ * Aiming for 60 us, safely above the 50us required. */ -#define WS2812_RST_CYCLES (CONFIG_WS2812_FREQUENCY * 60 / 10 / 8) +#define WS2812_RST_CYCLES (CONFIG_WS2812_FREQUENCY * 60 / 100 / 8) #define WS2812_BYTES_PER_LED (8 * 3) @@ -389,7 +389,7 @@ static inline void ws2812_configspi(FAR struct spi_dev_s *spi) SPI_SETMODE(spi, SPIDEV_MODE3); SPI_SETBITS(spi, 8); SPI_HWFEATURES(spi, 0); - SPI_SETFREQUENCY(spi, 10 * CONFIG_WS2812_FREQUENCY); + SPI_SETFREQUENCY(spi, CONFIG_WS2812_FREQUENCY); } /
[GitHub] [incubator-nuttx] btashton merged pull request #6849: drivers/leds/ws2812: Revert SPI frequency change
btashton merged PR #6849: URL: https://github.com/apache/incubator-nuttx/pull/6849 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] curuvar commented on pull request #6849: drivers/leds/ws2812: Revert SPI frequency change
curuvar commented on PR #6849: URL: https://github.com/apache/incubator-nuttx/pull/6849#issuecomment-1214184851 I have no problem with this change. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] diegoherranz commented on pull request #6528: Added RP2040 Boards: Adafruit KB2040 and Adafruit Feather RP2040
diegoherranz commented on PR #6528: URL: https://github.com/apache/incubator-nuttx/pull/6528#issuecomment-1214182776 After reading the code again, I think it was an attempt to express always the bit frequency directly. But, for SPI, it wouldn't be divided by 10 either, but by 8. Given that only a few SPI frequencies can be obtained in many MCUs, I find it clearer to define the actual SPI frequency when in SPI mode. I've submitted https://github.com/apache/incubator-nuttx/pull/6849 to revert that behaviour for the SPI mode and explained it in detail in Kconfig. I hope that's OK. Thanks! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] diegoherranz opened a new pull request, #6849: drivers/leds/ws2812: Revert SPI frequency change
diegoherranz opened a new pull request, #6849: URL: https://github.com/apache/incubator-nuttx/pull/6849 ## Summary https://github.com/apache/incubator-nuttx/commit/0c3db448bb64c8877a4dfa62416027b24a639a8e added the option to generate the waveforms to drive ws2812 and similar LEDs using different hardware (e.g. RP2040 PIO instead of SPI). For that new mode, the concept of CONFIG_WS2812_FREQUENCY is different. Instead of the SPI frequency (commonly a few MHz), it is the frequency of the actual output waveform (commonly 400 or 800 kHz). There was an attempt to express the SPI frequency divided by 10, but it's not actually the case either (it would be divided by 8). I think it is clearer to explain in Kconfig what CONFIG_WS2812_FREQUENCY means for each mode and go back to the previous behaviour for the original SPI mode (also to avoid breaking out-of-tree boards). ## Impact ws2812 driver only. And only for the original SPI mode. It restores the previous behaviour of the driver, so this, in fact, avoids impact for out-of-tree boards. ## Testing I don't have the custom board that I normally use at hand today to test it, but this should only revert the previous behaviour. Thanks! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] rm5248 commented on pull request #6800: Use GCC for LD on MIPS processors
rm5248 commented on PR #6800: URL: https://github.com/apache/incubator-nuttx/pull/6800#issuecomment-1214178534 after looking at this more, everything builds fine for me with the current master branch. I think I was in some weird state where I had either tried to use two different compilers and/or I had leftover data from something old. Closing as this is not an issue. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] rm5248 closed pull request #6800: Use GCC for LD on MIPS processors
rm5248 closed pull request #6800: Use GCC for LD on MIPS processors URL: https://github.com/apache/incubator-nuttx/pull/6800 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] masayuki2009 commented on pull request #6848: arch: qemu-rv: Fix high CPU usage in SMP mode
masayuki2009 commented on PR #6848: URL: https://github.com/apache/incubator-nuttx/pull/6848#issuecomment-1214166444 Hmm, what happened with the CI? ``` Successfully created virtual environment! Virtualenv location: /home/runner/.local/share/virtualenvs/Documentation-IPZhXGF9 Installing dependencies from Pipfile.lock (d73b9c)... To activate this project's virtualenv, run pipenv shell. Alternatively, run a command inside the virtualenv with pipenv run. Running Sphinx v3.5.3 Extension error: Could not import extension sphinx.transforms.post_transforms.code (exception: No module named 'packaging') make: *** [Makefile:45: html] Error 2 Error: Process completed with exit code 2. ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] masayuki2009 opened a new pull request, #6848: arch: qemu-rv: Fix high CPU usage in SMP mode
masayuki2009 opened a new pull request, #6848: URL: https://github.com/apache/incubator-nuttx/pull/6848 ## Summary - I noticed that QEMU shows high CPU usage if the number of CPUs does not match the kernel configuration. (e.g. -smp 8 and CONFIG_SMP_NCPUS=2) - This commit fixes this issue. ## Impact - qemu-rv only ## Testing - Tested with the following configs - rv-virt:smp64 (CONFIG_NCPUS=1/2/8) - rv-virt:nsh64 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[incubator-nuttx] 02/03: Added default config for lvgl configs based on both fb and lcddev.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit df0604a4bef363245991e664731bdcf9a85016f6
Author: Tiago Medicci Serrano
AuthorDate: Thu Aug 11 18:12:06 2022 -0300
Added default config for lvgl configs based on both fb and lcddev.
In order to better test the lcdddev driver and framebuffer, newer
board configs (for the TTGO T-Display and for the simulator) were
added.
Adjusted references of the sim:lvgl_(fb/lcd) config.
---
Documentation/platforms/sim/sim/index.rst | 2 +-
boards/sim/sim/sim/configs/{lvgl => lvgl_fb}/defconfig| 0
boards/sim/sim/sim/configs/{lvgl => lvgl_lcd}/defconfig | 4 ++--
.../esp32/ttgo_t_display_esp32/configs/{lvgl => lvgl_fb}/defconfig| 0
.../esp32/ttgo_t_display_esp32/configs/{lvgl => lvgl_lcd}/defconfig | 4 +---
tools/ci/testlist/sim-01.dat | 3 ++-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Documentation/platforms/sim/sim/index.rst
b/Documentation/platforms/sim/sim/index.rst
index 29337a1e0d..5d17d2eb69 100644
--- a/Documentation/platforms/sim/sim/index.rst
+++ b/Documentation/platforms/sim/sim/index.rst
@@ -62,7 +62,7 @@ It is possible to run the LVGL Demo directly in the NuttX
simulator ::
$ make distclean
-$ ./tools/configure.sh sim:lvgl
+$ ./tools/configure.sh sim:lvgl_fb
$ make -j
diff --git a/boards/sim/sim/sim/configs/lvgl/defconfig
b/boards/sim/sim/sim/configs/lvgl_fb/defconfig
similarity index 100%
copy from boards/sim/sim/sim/configs/lvgl/defconfig
copy to boards/sim/sim/sim/configs/lvgl_fb/defconfig
diff --git a/boards/sim/sim/sim/configs/lvgl/defconfig
b/boards/sim/sim/sim/configs/lvgl_lcd/defconfig
similarity index 97%
rename from boards/sim/sim/sim/configs/lvgl/defconfig
rename to boards/sim/sim/sim/configs/lvgl_lcd/defconfig
index 5b81d10054..1c3ebd8df7 100644
--- a/boards/sim/sim/sim/configs/lvgl/defconfig
+++ b/boards/sim/sim/sim/configs/lvgl_lcd/defconfig
@@ -23,13 +23,14 @@ CONFIG_DEBUG_WARN=y
CONFIG_DISABLE_ENVIRON=y
CONFIG_DISABLE_MOUNTPOINT=y
CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_LVGLDEMO=y
CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE=32768
CONFIG_GRAPHICS_LVGL=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="lvgldemo_main"
CONFIG_INPUT=y
+CONFIG_LCD=y
+CONFIG_LCD_DEV=y
CONFIG_LV_COLOR_DEPTH=32
CONFIG_LV_HOR_RES=640
CONFIG_LV_VER_RES=480
@@ -53,4 +54,3 @@ CONFIG_START_DAY=28
CONFIG_START_MONTH=11
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
-CONFIG_VIDEO_FB=y
diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
b/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_fb/defconfig
similarity index 100%
copy from boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
copy to boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_fb/defconfig
diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
b/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_lcd/defconfig
similarity index 96%
rename from boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
rename to boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_lcd/defconfig
index db48202010..69a6bcd023 100644
--- a/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl/defconfig
+++ b/boards/xtensa/esp32/ttgo_t_display_esp32/configs/lvgl_lcd/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
-CONFIG_DRIVERS_VIDEO=y
CONFIG_ESP32_SPI2=y
CONFIG_ESP32_SPI2_CLKPIN=18
CONFIG_ESP32_SPI2_CSPIN=5
@@ -37,7 +36,7 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LCD=y
-CONFIG_LCD_FRAMEBUFFER=y
+CONFIG_LCD_DEV=y
CONFIG_LCD_ST7789=y
CONFIG_LCD_ST7789_XOFFSET=53
CONFIG_LCD_ST7789_XRES=135
@@ -63,4 +62,3 @@ CONFIG_START_MONTH=12
CONFIG_START_YEAR=2011
CONFIG_SYSTEM_NSH=y
CONFIG_UART0_SERIAL_CONSOLE=y
-CONFIG_VIDEO_FB=y
diff --git a/tools/ci/testlist/sim-01.dat b/tools/ci/testlist/sim-01.dat
index c8f9298512..45bb40225b 100644
--- a/tools/ci/testlist/sim-01.dat
+++ b/tools/ci/testlist/sim-01.dat
@@ -18,7 +18,8 @@
-Darwin,sim:linuxspi
# macOS doesn't have X11
--Darwin,sim:lvgl
+-Darwin,sim:lvgl_fb
+-Darwin,sim:lvgl_lcd
-Darwin,sim:nsh2
-Darwin,sim:nx11
-Darwin,sim:nxlines
[incubator-nuttx] 03/03: Adjusting the APA102 driver to refer the buffer from the begining.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2234c005d16ad129899868142339ef1e66a27d7e
Author: Tiago Medicci Serrano
AuthorDate: Mon Aug 8 10:47:23 2022 -0300
Adjusting the APA102 driver to refer the buffer from the begining.
---
drivers/lcd/apa102.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/lcd/apa102.c b/drivers/lcd/apa102.c
index 981ec954ac..5a612872a1 100644
--- a/drivers/lcd/apa102.c
+++ b/drivers/lcd/apa102.c
@@ -505,12 +505,14 @@ static int apa102_putarea(FAR struct lcd_dev_s *dev,
if (i % 2 == 0)
{
priv->fb[(i * APA102_XRES) + j] =
-rgb565_apa102(*(src + (i * APA102_XRES) + j));
+rgb565_apa102(*(src + ((i - row_start) * APA102_XRES) +
+ (j - col_start)));
}
else
{
priv->fb[(i * APA102_XRES) + APA102_XRES - j - 1] =
-rgb565_apa102(*(src + (i * APA102_XRES) + j));
+rgb565_apa102(*(src + ((i - row_start) * APA102_XRES) +
+ (j - col_start)));
}
}
}
[incubator-nuttx] branch master updated (2b37909c9e -> 2234c005d1)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from 2b37909c9e libc: Move crc8.h, crc16.h and crc32.h from include to
include/nuttx
new ab60d0d3fb Framebuffer's callback buffer starts from the area being
drawn.
new df0604a4be Added default config for lvgl configs based on both fb and
lcddev.
new 2234c005d1 Adjusting the APA102 driver to refer the buffer from the
begining.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Documentation/platforms/sim/sim/index.rst | 2 +-
arch/sim/src/sim/up_lcd.c | 14 --
.../sim/sim/configs/{lvgl => lvgl_fb}/defconfig| 0
.../sim/sim/configs/{lvgl => lvgl_lcd}/defconfig | 4 +-
.../configs/{lvgl => lvgl_fb}/defconfig| 0
.../configs/{lvgl => lvgl_lcd}/defconfig | 4 +-
drivers/lcd/apa102.c | 14 --
drivers/lcd/gc9a01.c | 57 +-
drivers/lcd/lcd_dev.c | 20 +---
drivers/lcd/lcd_framebuffer.c | 13 ++---
drivers/lcd/st7789.c | 44 -
include/nuttx/lcd/lcd.h| 15 --
tools/ci/testlist/sim-01.dat | 3 +-
13 files changed, 133 insertions(+), 57 deletions(-)
copy boards/sim/sim/sim/configs/{lvgl => lvgl_fb}/defconfig (100%)
rename boards/sim/sim/sim/configs/{lvgl => lvgl_lcd}/defconfig (97%)
copy boards/xtensa/esp32/ttgo_t_display_esp32/configs/{lvgl =>
lvgl_fb}/defconfig (100%)
rename boards/xtensa/esp32/ttgo_t_display_esp32/configs/{lvgl =>
lvgl_lcd}/defconfig (96%)
[incubator-nuttx] 01/03: Framebuffer's callback buffer starts from the area being drawn.
This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git commit ab60d0d3fb441900be04e344a1368f1856fd1b50 Author: Tiago Medicci Serrano AuthorDate: Mon Aug 8 10:07:47 2022 -0300 Framebuffer's callback buffer starts from the area being drawn. The commit 664d45dcbace03a879017aa99566592be31f4308 updated the behavior of the framebuffer's putarea callback enabling it to be used to draw a particular area of the display. Previously, putarea was only used to draw the entire area of the display. Any different area was drawn, row by row, by putrun. Also, before checking for which callback to call, the framebuffer driver adjusted the buffer reference that was going to be used for calling the driver's callback to point to the init of the relevant data. After that commit, the framebuffer's buffer reference passed to the driver's putarea now contains the data to draw the entire display. Unlike the previous version of that implementation, only the putrun's callback buffer was being referenced from the address that contains the data that actually is being drawn. This commit fixes it by adjusting the reference for the run buffer passed to the putrun/putarea callback. It always starts from the beginning of the relevant data that is actually being drawn. That is necessary because lcddev (which uses the same LCD display driver callbacks) actually don't allocate a buffer containing the data to draw the whole display, so the same putarea implementation of the LCD drivers would'n be able to work for both lcddev and framebuffer. Also it's necessary to pass the stride argument to the LCD drivers in order to enable them to do partial writes by calculating the buffer offset while sending row-by-row. The stride is equal the width multiplied by the bytes per pixel (may add some padding) for framebuffer and is equal to the lenght of the row being drawn (multiplied by the same BPP) for lcddev. Why this approach? Other possible approaches would be: 1) modify lcddev driver to translate received buffer data to a buffer similar to the framebuffer. That wouldn't be efficient considering memory allocation. 2) Create a new callback function. While possible, it'd be confusing to create a different callback to draw the whole screen and another to draw only an area of the screen. Also, these callbacks would differ themselves only from the way the buffer is filled. 3) Simply reverting 664d45dcbace03a879017aa99566592be31f4308 would break the usage of the putarea callback to draw an area of the display, which would also be inefficient. This approach is based on the Zephyr's implementation of the ST7789 driver: the buffer starts from the beginiing of the region that would be drawn. The display device driver's putarea implementation should check if the operation refers to a full screen/full row and implement (if possible) a single operation to send the data to be drawn more efficiently. Finally, this approach requires that the drivers which implement the putarea callback and expects the entire framebuffer buffer to be modified. They don't need to calculate where the data begins as the new buffer represents the data from the address that is actually being drawn. This includes adjusting the LCD drivers GC9A01 and ST7789 and the driver for APA102-based LED matrix display. --- arch/sim/src/sim/up_lcd.c | 14 --- drivers/lcd/apa102.c | 8 -- drivers/lcd/gc9a01.c | 57 ++- drivers/lcd/lcd_dev.c | 20 +-- drivers/lcd/lcd_framebuffer.c | 13 +- drivers/lcd/st7789.c | 44 - include/nuttx/lcd/lcd.h | 15 7 files changed, 123 insertions(+), 48 deletions(-) diff --git a/arch/sim/src/sim/up_lcd.c b/arch/sim/src/sim/up_lcd.c index 98de2ab532..6420930688 100644 --- a/arch/sim/src/sim/up_lcd.c +++ b/arch/sim/src/sim/up_lcd.c @@ -104,9 +104,10 @@ struct sim_dev_s static int sim_putrun(struct lcd_dev_s *dev, fb_coord_t row, fb_coord_t col, const uint8_t *buffer, size_t npixels); -static int sim_putarea(struct lcd_dev_s *dev, fb_coord_t row_start, - fb_coord_t row_end, fb_coord_t col_start, - fb_coord_t col_end, const uint8_t *buffer); +static int sim_putarea(struct lcd_dev_s *dev, + fb_coord_t row_start, fb_coord_t row_end, + fb_coord_t col_start, fb_coord_t col_end, + const uint8_t *buffer, fb_coord_t stride); static int sim_getrun(struct lcd_dev_s *dev, fb_coord_t row, fb_coord_t col, uint8_t
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #6837: Framebuffer and lcddev buffer usage for LCD displays drivers
xiaoxiang781216 merged PR #6837: URL: https://github.com/apache/incubator-nuttx/pull/6837 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [incubator-nuttx] pkarashchenko merged pull request #6840: libc: Move crc8.h, crc16.h and crc32.h from include to include/nuttx
pkarashchenko merged PR #6840: URL: https://github.com/apache/incubator-nuttx/pull/6840 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[incubator-nuttx-apps] branch master updated: zmodem: Move crc16.h and crc32.h from host to host/nuttx
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new b515a00fe zmodem: Move crc16.h and crc32.h from host to host/nuttx
b515a00fe is described below
commit b515a00feae07482e7db7c2fa175100822d1df6e
Author: Xiang Xiao
AuthorDate: Fri Aug 12 14:20:07 2022 +0800
zmodem: Move crc16.h and crc32.h from host to host/nuttx
to avoid the conflict with the 3rd party library
Signed-off-by: Xiang Xiao
---
examples/configdata/configdata_main.c | 2 +-
fsutils/mkgpt/mkgpt.c | 3 ++-
system/zmodem/host/{ => nuttx}/crc16.h | 8
system/zmodem/host/{ => nuttx}/crc32.h | 8
system/zmodem/zm_proto.c | 5 +++--
system/zmodem/zm_send.c| 7 ---
system/zmodem/zm_state.c | 4 ++--
system/zmodem/zm_utils.c | 3 ++-
testing/fstest/fstest_main.c | 3 ++-
testing/nxffs/nxffs_main.c | 2 +-
testing/smart/smart_main.c | 2 +-
11 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/examples/configdata/configdata_main.c
b/examples/configdata/configdata_main.c
index 6d230b201..a90118f25 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -33,9 +33,9 @@
#include
#include
#include
-#include
#include
+#include
#include
#include
#include
diff --git a/fsutils/mkgpt/mkgpt.c b/fsutils/mkgpt/mkgpt.c
index ac2744861..5b2c3d3f5 100644
--- a/fsutils/mkgpt/mkgpt.c
+++ b/fsutils/mkgpt/mkgpt.c
@@ -22,7 +22,6 @@
* Included Files
/
-#include
#include
#include
#include
@@ -35,6 +34,8 @@
#include
#include
+#include
+
/
* Pre-processor Definitions
/
diff --git a/system/zmodem/host/crc16.h b/system/zmodem/host/nuttx/crc16.h
similarity index 91%
rename from system/zmodem/host/crc16.h
rename to system/zmodem/host/nuttx/crc16.h
index be1f71151..6abfb7387 100644
--- a/system/zmodem/host/crc16.h
+++ b/system/zmodem/host/nuttx/crc16.h
@@ -1,5 +1,5 @@
/
- * apps/system/zmodem/host/crc16.h
+ * apps/system/zmodem/host/nuttx/crc16.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
/
-#ifndef __APPS_SYSTEM_ZMODEM_HOST_CRC16_H
-#define __APPS_SYSTEM_ZMODEM_HOST_CRC16_H
+#ifndef __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CRC16_H
+#define __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CRC16_H
/
* Included Files
@@ -65,4 +65,4 @@ uint16_t crc16(const uint8_t *src, size_t len);
}
#endif
-#endif /* __APPS_SYSTEM_ZMODEM_HOST_CRC16_H */
+#endif /* __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CRC16_H */
diff --git a/system/zmodem/host/crc32.h b/system/zmodem/host/nuttx/crc32.h
similarity index 91%
rename from system/zmodem/host/crc32.h
rename to system/zmodem/host/nuttx/crc32.h
index 55f8349b7..fd4878607 100644
--- a/system/zmodem/host/crc32.h
+++ b/system/zmodem/host/nuttx/crc32.h
@@ -1,5 +1,5 @@
/
- * apps/system/zmodem/host/crc32.h
+ * apps/system/zmodem/host/nuttx/crc32.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
/
-#ifndef __APPS_SYSTEM_ZMODEM_HOST_CRC32_H
-#define __APPS_SYSTEM_ZMODEM_HOST_CRC32_H
+#ifndef __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CRC32_H
+#define __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CRC32_H
/
* Included Files
@@ -65,4 +65,4 @@ uint32_t crc32(const uint8_t *src, size_t len);
}
#endif
-#endif /* __APPS_SYSTEM_ZMODEM_HOST_CRC32_H */
+#endif /* __APPS_SYSTEM_ZMODEM_HOST_NUTTX_CRC32_H */
diff --git a/system/zmodem/zm_proto.c b/system/zmodem/zm_proto.c
index f94f3c464..09131da6c 100644
--- a/system/zmodem/zm_proto.c
+++ b/system/zmodem/zm_proto.c
@@ -30,8 +30,9 @@
#include
#include
-#include
-#include
+
+#include
+#include
#include "zm.h"
diff --git a/system/zmodem/zm_send.c b/system/zmodem/zm_send.c
index 39fb5b44a..32555c539 100644
--- a/system/zmodem/zm_send.c
+++ b/system/zmodem/zm_send.c
@@ -45,11 +45,12 @@
#include
#include
#include
-#include
-#include
+#include
[GitHub] [incubator-nuttx-apps] pkarashchenko merged pull request #1260: zmodem: Move crc16.h and crc32.h from host to host/nuttx
pkarashchenko merged PR #1260: URL: https://github.com/apache/incubator-nuttx-apps/pull/1260 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[incubator-nuttx] branch master updated: libc: Move crc8.h, crc16.h and crc32.h from include to include/nuttx
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 2b37909c9e libc: Move crc8.h, crc16.h and crc32.h from include to
include/nuttx
2b37909c9e is described below
commit 2b37909c9e70d0646135f67f2ed8643757563860
Author: Xiang Xiao
AuthorDate: Fri Aug 12 14:13:41 2022 +0800
libc: Move crc8.h, crc16.h and crc32.h from include to include/nuttx
to avoid the conflict with the 3rd party library
Signed-off-by: Xiang Xiao
---
arch/arm/src/stm32/stm32_bbsram.c | 3 +--
arch/arm/src/stm32f7/stm32_bbsram.c| 3 +--
arch/arm/src/stm32f7/stm32_ethernet.c | 2 +-
arch/arm/src/stm32h7/stm32_bbsram.c| 3 +--
arch/arm/src/stm32h7/stm32_ethernet.c | 2 +-
arch/renesas/src/rx65n/rx65n_sbram.c | 3 +--
arch/risc-v/src/esp32c3/esp32c3_wlan.c | 2 +-
arch/xtensa/src/esp32/esp32_emac.c | 2 +-
arch/xtensa/src/esp32/esp32_wlan.c | 2 +-
drivers/mtd/smart.c| 7 +++
drivers/net/ftmac100.c | 2 +-
drivers/power/battery/bq769x0.c| 2 +-
drivers/sensors/mlx90614.c | 2 +-
fs/nxffs/nxffs_dump.c | 2 +-
fs/nxffs/nxffs_inode.c | 2 +-
fs/nxffs/nxffs_open.c | 2 +-
fs/nxffs/nxffs_pack.c | 2 +-
fs/nxffs/nxffs_read.c | 2 +-
fs/nxffs/nxffs_write.c | 2 +-
fs/partition/fs_gpt.c | 2 +-
include/{ => nuttx}/crc16.h| 8
include/{ => nuttx}/crc32.h| 8
include/{ => nuttx}/crc64.h| 8
include/{ => nuttx}/crc8.h | 8
libs/libc/libc.csv | 4 ++--
libs/libc/misc/lib_crc16.c | 3 ++-
libs/libc/misc/lib_crc32.c | 3 ++-
libs/libc/misc/lib_crc64.c | 3 ++-
libs/libc/misc/lib_crc8.c | 3 ++-
libs/libc/misc/lib_crc8ccitt.c | 3 ++-
libs/libc/misc/lib_crc8table.c | 3 ++-
31 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/arch/arm/src/stm32/stm32_bbsram.c
b/arch/arm/src/stm32/stm32_bbsram.c
index 395e6d5c98..6f2cdf3fa3 100644
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@@ -40,8 +40,7 @@
#include
#include
#include
-
-#include
+#include
#include "stm32_bbsram.h"
#include "chip.h"
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c
b/arch/arm/src/stm32f7/stm32_bbsram.c
index b2b583e1ef..4cc6111ee4 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.c
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@@ -40,8 +40,7 @@
#include
#include
#include
-
-#include
+#include
#include "stm32_bbsram.h"
#include "chip.h"
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c
b/arch/arm/src/stm32f7/stm32_ethernet.c
index 9a68b794dd..28e8beffd0 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -44,7 +44,7 @@
#include
#include
#include
-#include
+#include
#if defined(CONFIG_NET_PKT)
# include
diff --git a/arch/arm/src/stm32h7/stm32_bbsram.c
b/arch/arm/src/stm32h7/stm32_bbsram.c
index 815c18505a..d05b56d58f 100644
--- a/arch/arm/src/stm32h7/stm32_bbsram.c
+++ b/arch/arm/src/stm32h7/stm32_bbsram.c
@@ -39,8 +39,7 @@
#include
#include
#include
-
-#include
+#include
#include "stm32_bbsram.h"
#include "chip.h"
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c
b/arch/arm/src/stm32h7/stm32_ethernet.c
index 4c131f5a62..e79387d4db 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@@ -44,7 +44,7 @@
#include
#include
#include
-#include
+#include
#if defined(CONFIG_NET_PKT)
# include
diff --git a/arch/renesas/src/rx65n/rx65n_sbram.c
b/arch/renesas/src/rx65n/rx65n_sbram.c
index cb207a33c0..e36d8ec8e6 100644
--- a/arch/renesas/src/rx65n/rx65n_sbram.c
+++ b/arch/renesas/src/rx65n/rx65n_sbram.c
@@ -40,8 +40,7 @@
#include
#include
#include
-
-#include
+#include
#include "rx65n_sbram.h"
#include "chip.h"
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wlan.c
b/arch/risc-v/src/esp32c3/esp32c3_wlan.c
index c70ec77872..92afdb05ef 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wlan.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wlan.c
@@ -30,7 +30,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/arch/xtensa/src/esp32/esp32_emac.c
b/arch/xtensa/src/esp32/esp32_emac.c
index b20905bcd4..5e4f612703 100644
--- a/arch/xtensa/src/esp32/esp32_emac.c
+++ b/arch/xtensa/src/esp32/esp32_emac.c
@@ -37,7 +37,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/arch/xtensa/src/esp32/esp32_wlan.c
b/arch/xtensa/src/esp32/esp32_wlan.c
index 6b16fe4c2f..db86734cca 100644
--- a/arch/xtensa/src/esp32/esp32_wlan.c
+++
