From 591f41b3cb9f570bd5bfff470e2e275e5de4baf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Fri, 9 Nov 2018 00:29:03 +0100 Subject: [PATCH] Update foo --- fatfs/shimatta_sdio_driver/shimatta_sdio.c | 16 ++-- .../shimatta_sdio_config.h | 2 +- main.c | 2 +- stm32sdio Debug.launch | 83 ------------------- 4 files changed, 10 insertions(+), 93 deletions(-) delete mode 100644 stm32sdio Debug.launch diff --git a/fatfs/shimatta_sdio_driver/shimatta_sdio.c b/fatfs/shimatta_sdio_driver/shimatta_sdio.c index 787963c..218011c 100644 --- a/fatfs/shimatta_sdio_driver/shimatta_sdio.c +++ b/fatfs/shimatta_sdio_driver/shimatta_sdio.c @@ -39,21 +39,21 @@ int SDIO_send_cmd(uint8_t CMD, uint32_t arg, uint8_t expectedAns); int SDIO_get_response(uint8_t expectedCMD, uint8_t typeOfAns, uint32_t* responseBuffer); -void SDIO_wait_cmd_sent(); +void SDIO_wait_cmd_sent(void); ACMD41_RESP_t SDIO_init_card_ACMD41(uint8_t HCS); -int SDIO_switch_appmode_CMD55(); -int SDIO_send_all_send_cid_CMD2(); +int SDIO_switch_appmode_CMD55(void); +int SDIO_send_all_send_cid_CMD2(void); int SDIO_send_relative_address_CMD3(uint16_t* rca); -int SDIO_send_go_idle_CMD0(); -CMD8_RESP_t SDIO_send_iface_condition_CMD8(); +int SDIO_send_go_idle_CMD0(void); +CMD8_RESP_t SDIO_send_iface_condition_CMD8(void); int SDIO_send_block_length_CMD16(uint32_t blocklen); int SDIO_send_bus_width_ACMD6(uint8_t bus_width); int SDIO_send_csd_CMD9(uint16_t rca, uint32_t *responsebuffer); int SDIO_send_select_card_CMD7(uint16_t rca); int SDIO_check_status_register_CMD13(uint16_t rca, uint32_t *status); -void SDIO_init_detect_pins(); -int checkNotInserted(); // Returns 0 if inserted! -int checkWriteProtection(); // returns 0 if write protected +void SDIO_init_detect_pins(void); +int checkNotInserted(void); // Returns 0 if inserted! +int checkWriteProtection(void); // returns 0 if write protected void switchPrescaler(uint8_t clkdiv); int SDIO_send_write_block_CMD24(uint32_t addr); int SDIO_send_read_block_CMD17(uint32_t addr); diff --git a/fatfs/shimatta_sdio_driver/shimatta_sdio_config.h b/fatfs/shimatta_sdio_driver/shimatta_sdio_config.h index c0974dd..4f81dd0 100644 --- a/fatfs/shimatta_sdio_driver/shimatta_sdio_config.h +++ b/fatfs/shimatta_sdio_driver/shimatta_sdio_config.h @@ -14,7 +14,7 @@ //Initial Transfer CLK (ca. 400kHz) #define INITCLK 130 //120 //Working CLK (Maximum) -#define WORKCLK 255 //0 +#define WORKCLK 50 //0 //Data Timeout in CLK Cycles #define DTIMEOUT 0x3000 //150 //DMA Stream used for TX and RX DMA2 Stream 3 or 6 possible diff --git a/main.c b/main.c index be3b088..1dd1a7f 100644 --- a/main.c +++ b/main.c @@ -12,7 +12,7 @@ #include #include -#define OUTPUT(pin) (0b01 << (pin * 2)) +#define OUTPUT(pin) (0x01 << (pin * 2)) FATFS SDfs; FIL file; diff --git a/stm32sdio Debug.launch b/stm32sdio Debug.launch deleted file mode 100644 index 6cface9..0000000 --- a/stm32sdio Debug.launch +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -