Making sure sdhci.c uses sdhci_regs.c instead of bcm_emmc_regs.c.

Author: ptrk8

mmc/CMakeLists.txt

@@ -403,7 +403,7 @@ add_library(mmc_rpi3b_lib_sdhci src/mmc_driver/sdhci.c)
 target_include_directories(mmc_rpi3b_lib_sdhci PUBLIC include/)
 target_link_libraries(
         mmc_rpi3b_lib_sdhci
-        mmc_rpi3b_lib_bcm_emmc_regs
+        mmc_rpi3b_lib_sdhci_regs
         mmc_rpi3b_lib_result
         mmc_rpi3b_lib_sleep
         mmc_rpi3b_lib_log
@@ -424,7 +424,7 @@ target_include_directories(mmc_rpi3b_lib_bcm_emmc PUBLIC include/)
 target_link_libraries(
         mmc_rpi3b_lib_bcm_emmc
         mmc_rpi3b_lib_result
-        mmc_rpi3b_lib_bcm_emmc_regs
+        mmc_rpi3b_lib_sdhci_regs
         mmc_rpi3b_lib_sleep
         mmc_rpi3b_lib_sdhci
         mmc_rpi3b_lib_log
@@ -444,6 +444,7 @@ target_link_libraries(
         mmc_rpi3b_lib_log
         mmc_rpi3b_lib_bcm_emmc
         mmc_rpi3b_lib_sdcard
+        mmc_rpi3b_lib_sdhci_regs
 )
 
 add_library(mmc_rpi3b_lib_mmc_driver src/mmc_driver.c)
@@ -452,6 +453,7 @@ target_link_libraries(
         mmc_rpi3b_lib_mmc_driver
         mmc_rpi3b_sel4cp_facade
         mmc_rpi3b_lib_bcm_emmc
+        mmc_rpi3b_lib_bcm_emmc_regs
         mmc_rpi3b_lib_result
         mmc_rpi3b_lib_printf
         mmc_rpi3b_lib_log

mmc/include/bcm_emmc.h

@@ -2,27 +2,22 @@
 #pragma once
 
 #include "result.h"
-#include "bcm_emmc_regs.h"
+#include "sdhci_regs.h"
 #include "sleep.h"
 #include "sdhci.h"
 #include "log.h"
 #include "sdhci_result.h"
 #include "bcm_gpio_regs.h"
 #include "gpio_driver.h"
 
-//typedef struct bcm_emmc bcm_emmc_t;
-//struct bcm_emmc {
-//    bcm_emmc_regs_t *regs;
-//};
-
 /**
  * Initialises the BCM EMMC device.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param bcm_gpio_regs
  * @return
  */
 result_t bcm_emmc_init(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         bcm_gpio_regs_t *bcm_gpio_regs
 );
 

mmc/include/mmc_driver.h

@@ -5,6 +5,7 @@
 #include "sel4cp_facade.h"
 #include "result.h"
 #include "bcm_emmc.h"
+#include "bcm_emmc_regs.h"
 
 #include "log.h"
 #include "printf.h"

mmc/include/mmc_driver_e2e.h

@@ -8,7 +8,7 @@
 #include "clock.h"
 #include "log.h"
 #include "sdhci.h"
-#include "bcm_emmc_regs.h"
+#include "sdhci_regs.h"
 #include "sdcard.h"
 
 /**
@@ -19,22 +19,23 @@ result_t mmc_driver_e2e_sleep();
 
 /**
  * Simple read/write test on the SD card.
+ * @param sdhci_regs
+ * @param sdcard
  * @return
  */
 result_t mmc_driver_e2e_read_write_simple(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard
 );
 
 /**
  * Read/write test on the SD card.
- * @return
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdcard
  * @return
  */
 result_t mmc_driver_e2e_read_write_multiple_blocks(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard
 );
 

mmc/include/sdhci.h

@@ -1,7 +1,8 @@
 #pragma once
 
 #include "result.h"
-#include "bcm_emmc_regs.h"
+#include "sdhci_regs.h"
+//#include "sdhci_regs.h"
 #include "sleep.h"
 #include "log.h"
 #include "arith.h"
@@ -17,34 +18,34 @@
 
 /**
  * Initialises an SD card.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdcard
  * @return
  */
 result_t sdhci_card_init_and_id(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard,
         sdhci_result_t *sdhci_result
 );
 
 /**
  * Sets the Bus Width to its maximum value as specified by the SD Card
  * Configuration Register (SCR), which is stored in our `sdcard`.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdcard
  * @param sd_clock_freq_hz
  * @param sdhci_result
  * @return
  */
 result_t sdhci_set_max_bus_width(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard,
         sdhci_result_t *sdhci_result
 );
 
 /**
  * Reads the specified number of blocks from the SD card.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdcard
  * @param lba
  * @param num_blocks
@@ -55,7 +56,7 @@ result_t sdhci_set_max_bus_width(
  * @return
  */
 result_t sdhci_read_blocks(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard,
         size_t lba,
         size_t num_blocks,
@@ -67,7 +68,7 @@ result_t sdhci_read_blocks(
 
 /**
  * Writes the specified number of blocks to the SD card.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdcard
  * @param lba
  * @param num_blocks
@@ -78,7 +79,7 @@ result_t sdhci_read_blocks(
  * @return
  */
 result_t sdhci_write_blocks(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard,
         size_t lba,
         size_t num_blocks,
@@ -90,7 +91,7 @@ result_t sdhci_write_blocks(
 
 /**
  * Transfers specified number of blocks to/from the SD card.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdcard
  * @param lba
  * @param num_blocks
@@ -102,7 +103,7 @@ result_t sdhci_write_blocks(
  * @return
  */
 result_t sdhci_transfer_blocks(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdcard_t *sdcard,
         size_t lba,
         size_t num_blocks,
@@ -122,7 +123,7 @@ result_t sdhci_transfer_blocks(
  * @return
  */
 result_t sdhci_get_sd_clock_divisor(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         uint32_t freq,
         uint32_t *ret_val
 );
@@ -134,56 +135,56 @@ result_t sdhci_get_sd_clock_divisor(
  * @return
  */
 result_t sdhci_set_sd_clock(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         uint32_t freq
 );
 
 /**
  * Waits for the specified interrupt to be set.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param interrupt_mask
  * @param sdhci_result
  * @return
  */
 result_t sdhci_wait_for_interrupt(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         uint32_t interrupt_mask,
         sdhci_result_t *sdhci_result
 );
 
 /**
  * Waits for cmd_in_progress to be cleared.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdhci_result
  * @return
  */
 result_t sdhci_wait_for_cmd_in_progress(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdhci_result_t *sdhci_result
 );
 
 /**
  * Waits for data_in_progress to be cleared.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdhci_result
  * @return
  */
 result_t sdhci_wait_for_data_in_progress(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         sdhci_result_t *sdhci_result
 );
 
 /**
  * Sends the specified command to the SD card.
- * @param bcm_emmc_regs
+ * @param sdhci_regs
  * @param sdhci_cmd_index
  * @param arg
  * @param sdcard
  * @param sdhci_result
  * @return
  */
 result_t sdhci_send_cmd(
-        bcm_emmc_regs_t *bcm_emmc_regs,
+        sdhci_regs_t *sdhci_regs,
         size_t sdhci_cmd_index,
         uint32_t arg,
         sdcard_t *sdcard,

mmc/src/mmc_driver.c

@@ -79,31 +79,31 @@ void init(void) {
      * depends upon.*/
     mmc_driver_e2e_sleep();
 
-    /* Initialise and reset the Pi's SD card Host Controller. */
-    res = bcm_emmc_init(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
-            (bcm_gpio_regs_t *) gpio_base_vaddr
+    /* Initialise SDHCI registers. */
+    res = sdhci_regs_init(
+            &global_sdhci_regs,
+            (void *) emmc_base_vaddr
     );
     if (result_is_err(res)) {
         result_printf(res);
         return;
     }
-    log_trace("Finished initialising SD Host Controller.");
 
-    /* Initialise SDHCI registers. */
-    res = sdhci_regs_init(
+    /* Initialise and reset the Pi's SD card Host Controller. */
+    res = bcm_emmc_init(
             &global_sdhci_regs,
-            (void *) emmc_base_vaddr
+            (bcm_gpio_regs_t *) gpio_base_vaddr
     );
     if (result_is_err(res)) {
         result_printf(res);
         return;
     }
+    log_trace("Finished initialising SD Host Controller.");
 
     /* Initialise and identify the SD card. */
     sdhci_result_t sdhci_result;
     res = sdhci_card_init_and_id(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
+            &global_sdhci_regs,
             &global_sdcard,
             &sdhci_result
     );
@@ -115,7 +115,7 @@ void init(void) {
 
     /* Setting Bus Width to maximum possible value. */
     res = sdhci_set_max_bus_width(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
+            &global_sdhci_regs,
             &global_sdcard,
             &sdhci_result
     );
@@ -127,7 +127,7 @@ void init(void) {
 
     /* Running E2E tests to verify our SD card driver works properly.*/
     res = mmc_driver_e2e_read_write_simple(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
+            &global_sdhci_regs,
             &global_sdcard
     );
     if (result_is_err(res)) {
@@ -136,7 +136,7 @@ void init(void) {
     }
 
     res = mmc_driver_e2e_read_write_multiple_blocks(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
+            &global_sdhci_regs,
             &global_sdcard
     );
     if (result_is_err(res)) {
@@ -187,7 +187,7 @@ result_t mmc_driver_write_blocks(
     }
     sdhci_result_t sdhci_result;
     return sdhci_write_blocks(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
+            &global_sdhci_regs,
             &global_sdcard,
             lba,
             num_blocks,
@@ -210,7 +210,7 @@ result_t mmc_driver_read_blocks(
     }
     sdhci_result_t sdhci_result;
     return sdhci_read_blocks(
-            (bcm_emmc_regs_t *) emmc_base_vaddr,
+            &global_sdhci_regs,
             &global_sdcard,
             lba,
             num_blocks,