Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New patch update for AT32F415 #407

Merged
merged 18 commits into from
Aug 11, 2024
Merged

New patch update for AT32F415 #407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6bbcbcd
Patch update and cleanup CMSIS AT32F415 files
HorrorTroll May 5, 2024
ceb0454
Another patch update and cleanup AT32F415 files
HorrorTroll Jun 25, 2024
e234b69
Update board file, added new demo and HAL test
HorrorTroll Jul 3, 2024
fbdaa46
Update version of CMSIS files
HorrorTroll Jul 3, 2024
7c973fe
Update LLD driver for I2C, OTG and ERTC
HorrorTroll Jul 28, 2024
dc3f512
Update LLD driver for SYSTICK and GPT Timer
HorrorTroll Jul 30, 2024
fad2fcb
Update LLD driver for USART, ICU and PWM timers
HorrorTroll Aug 1, 2024
ae019b7
Update LLD drivers for ERTC and WDT again
HorrorTroll Aug 2, 2024
163d7ce
Update demo test
HorrorTroll Aug 3, 2024
f0adeb5
Added HAL driver test for ERTC, I2C bitbang and hardware
HorrorTroll Aug 3, 2024
0c71846
Added HAL driver test for ICU, PWM and UART
HorrorTroll Aug 4, 2024
6404f2f
Fixed missing CRC register on CMSIS
HorrorTroll Aug 5, 2024
41b3477
Deleted unused CRC on registry and update HAL test files
HorrorTroll Aug 5, 2024
92bcbce
Update LLD drivers for WDT again and small changes for HAL test
HorrorTroll Aug 5, 2024
b79c568
Added HAL driver test for WDT and update for USB_CDC
HorrorTroll Aug 5, 2024
a48b486
Update SPI LLD driver
HorrorTroll Aug 11, 2024
635a296
Added support for SDIO LLD driver
HorrorTroll Aug 11, 2024
d839f5d
Update mcuconf for all the test and demo files. Added new test for SD…
HorrorTroll Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added support for SDIO LLD driver
  • Loading branch information
@HorrorTroll
HorrorTroll committed Aug 11, 2024
commit 635a296fa132deaa663c7943136b6cbf9755e583
22 changes: 22 additions & 0 deletions os/hal/boards/AT_START_F415/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@ void __early_init(void) {
at32_clock_init();
}

#if HAL_USE_SDC || defined(__DOXYGEN__)
/**
* @brief SDC card detection.
*/
bool sdc_lld_is_card_inserted(SDCDriver *sdcp) {
static bool last_status = false;

if (blkIsTransferring(sdcp))
return last_status;
return last_status = (bool)palReadPad(GPIOA, GPIOA_ARD_A2);
}

/**
* @brief SDC card write protection detection.
*/
bool sdc_lld_is_write_protected(SDCDriver *sdcp) {

(void)sdcp;
return false;
}
#endif /* HAL_USE_SDC */

/**
* @brief Board-specific initialization code.
* @note You can add your board-specific code here.
Expand Down
2 changes: 1 addition & 1 deletion os/hal/ports/AT32/AT32F415/at32_dmamux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
#define AT32_DMAMUX_I2C1_TX 42
#define AT32_DMAMUX_I2C2_RX 43
#define AT32_DMAMUX_I2C2_TX 44
#define AT32_DMAMUX_SDIO1 49
#define AT32_DMAMUX_SDIO 49
#define AT32_DMAMUX_TMR1_TRIG 53
#define AT32_DMAMUX_TMR1_HALL 54
#define AT32_DMAMUX_TMR1_OVERFLOW 55
Expand Down
48 changes: 24 additions & 24 deletions os/hal/ports/AT32/AT32F415/at32_registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@
#define AT32_HAS_QUADSPI1 FALSE

/* SDIO attributes.*/
#define AT32_HAS_SDIO1 TRUE
#define AT32_HAS_SDIO TRUE

#if (AT32_DMA_USE_DMAMUX == TRUE) || defined(__DOXYGEN__)
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO1_DMAMUX_CHANNEL 5
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO_DMAMUX_CHANNEL 5
#else
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#endif

/* SPI attributes.*/
Expand Down Expand Up @@ -357,13 +357,13 @@
#define AT32_HAS_QUADSPI1 FALSE

/* SDIO attributes.*/
#define AT32_HAS_SDIO1 TRUE
#define AT32_HAS_SDIO TRUE

#if (AT32_DMA_USE_DMAMUX == TRUE) || defined(__DOXYGEN__)
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO1_DMAMUX_CHANNEL 5
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO_DMAMUX_CHANNEL 5
#else
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#endif

/* SPI attributes.*/
Expand Down Expand Up @@ -571,13 +571,13 @@
#define AT32_HAS_QUADSPI1 FALSE

/* SDIO attributes.*/
#define AT32_HAS_SDIO1 TRUE
#define AT32_HAS_SDIO TRUE

#if (AT32_DMA_USE_DMAMUX == TRUE) || defined(__DOXYGEN__)
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO1_DMAMUX_CHANNEL 5
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO_DMAMUX_CHANNEL 5
#else
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#endif

/* SPI attributes.*/
Expand Down Expand Up @@ -796,13 +796,13 @@
#define AT32_HAS_QUADSPI1 FALSE

/* SDIO attributes.*/
#define AT32_HAS_SDIO1 TRUE
#define AT32_HAS_SDIO TRUE

#if (AT32_DMA_USE_DMAMUX == TRUE) || defined(__DOXYGEN__)
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO1_DMAMUX_CHANNEL 5
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO_DMAMUX_CHANNEL 5
#else
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#endif

/* SPI attributes.*/
Expand Down Expand Up @@ -1021,13 +1021,13 @@
#define AT32_HAS_QUADSPI1 FALSE

/* SDIO attributes.*/
#define AT32_HAS_SDIO1 TRUE
#define AT32_HAS_SDIO TRUE

#if (AT32_DMA_USE_DMAMUX == TRUE) || defined(__DOXYGEN__)
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO1_DMAMUX_CHANNEL 5
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO_DMAMUX_CHANNEL 5
#else
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#endif

/* SPI attributes.*/
Expand Down Expand Up @@ -1265,13 +1265,13 @@
#define AT32_HAS_QUADSPI1 FALSE

/* SDIO attributes.*/
#define AT32_HAS_SDIO1 TRUE
#define AT32_HAS_SDIO TRUE

#if (AT32_DMA_USE_DMAMUX == TRUE) || defined(__DOXYGEN__)
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO1_DMAMUX_CHANNEL 5
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(1, 5)
#define AT32_SDC_SDIO_DMAMUX_CHANNEL 5
#else
#define AT32_SDC_SDIO1_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#define AT32_SDC_SDIO_DMA_STREAM AT32_DMA_STREAM_ID(2, 4)
#endif

/* SPI attributes.*/
Expand Down
1 change: 1 addition & 0 deletions os/hal/ports/AT32/AT32F415/platform.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/GPIOv1/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/I2Cv1/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/OTGv1/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/RTCv2/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/SDIOv1/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/SPIv1/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/SYSTICKv1/driver.mk
include $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/TMRv1/driver.mk
Expand Down
9 changes: 9 additions & 0 deletions os/hal/ports/AT32/LLD/SDIOv1/driver.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifeq ($(USE_SMART_BUILD),yes)
ifneq ($(findstring HAL_USE_SDC TRUE,$(HALCONF)),)
PLATFORMSRC_CONTRIB += $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.c
endif
else
PLATFORMSRC_CONTRIB += $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/SDIOv1/hal_sdc_lld.c
endif

PLATFORMINC_CONTRIB += $(CHIBIOS_CONTRIB)/os/hal/ports/AT32/LLD/SDIOv1
Loading