sdmmc: update to latest sddf

Signed-off-by: Cheng <[email protected]>
au-ts · Oct 22, 2024 · 0581e17 · 0581e17
1 parent fe41ae9
commit 0581e17
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/drivers/blk/sdmmc/src/sddf_helper.c b/drivers/blk/sdmmc/src/sddf_helper.c
@@ -11,7 +11,7 @@ blk_resp_queue_t *blk_resp_queue;
 blk_storage_info_t *blk_config;
 
 void blk_queue_init_helper() {
-    blk_queue_init(queue_handle, blk_req_queue, blk_resp_queue, BLK_QUEUE_SIZE_DRIV);
+    blk_queue_init(queue_handle, blk_req_queue, blk_resp_queue, BLK_QUEUE_CAPACITY_DRIV);
     blk_config->sector_size = 512;
     blk_config->block_size = 1;
     blk_config->capacity = 0xFFFFFFFFFF;

diff --git a/examples/blk/board/odroidc4/blk.system b/examples/blk/board/odroidc4/blk.system
@@ -31,23 +31,24 @@
     <protection_domain name="virt" priority="99">
         <program_image path="blk_virt.elf" />
 
-        <map mr="blk_driver_config" vaddr="0x40000000" perms="rw" cached="false" setvar_vaddr="blk_config_driver"     />
-        <map mr="blk_driver_request" vaddr="0x40200000" perms="rw" cached="false" setvar_vaddr="blk_req_queue_driver"  />
-        <map mr="blk_driver_response" vaddr="0x40400000" perms="rw" cached="false" setvar_vaddr="blk_resp_queue_driver" />
-        <map mr="blk_driver_data" vaddr="0x40600000" perms="rw" cached="true" setvar_vaddr="blk_data_driver" />
-        <setvar symbol="blk_data_driver_paddr" region_paddr="blk_driver_data" />
+        <map mr="blk_driver_config" vaddr="0x40000000" perms="rw" cached="false" setvar_vaddr="blk_driver_storage_info"     />
+        <map mr="blk_driver_request" vaddr="0x40200000" perms="rw" cached="false" setvar_vaddr="blk_driver_req_queue"  />
+        <map mr="blk_driver_response" vaddr="0x40400000" perms="rw" cached="false" setvar_vaddr="blk_driver_resp_queue" />
+        <map mr="blk_driver_data" vaddr="0x40600000" perms="rw" cached="true" setvar_vaddr="blk_driver_data" />
+        <setvar symbol="blk_data_paddr_driver" region_paddr="blk_driver_data" />
 
-        <map mr="blk_client_config" vaddr="0x30000000" perms="rw" cached="false" setvar_vaddr="blk_config"     />
-        <map mr="blk_client_request" vaddr="0x30200000" perms="rw" cached="false" setvar_vaddr="blk_req_queue"  />
-        <map mr="blk_client_response" vaddr="0x30400000" perms="rw" cached="false" setvar_vaddr="blk_resp_queue" />
-        <map mr="blk_client_data" vaddr="0x30600000" perms="rw" cached="true" setvar_vaddr="blk_client_data_start" />
+        <map mr="blk_client_config" vaddr="0x30000000" perms="rw" cached="false" setvar_vaddr="blk_client_storage_info"     />
+        <map mr="blk_client_request" vaddr="0x30200000" perms="rw" cached="false" setvar_vaddr="blk_client_req_queue"  />
+        <map mr="blk_client_response" vaddr="0x30400000" perms="rw" cached="false" setvar_vaddr="blk_client_resp_queue" />
+        <map mr="blk_client_data" vaddr="0x30600000" perms="rw" cached="true" setvar_vaddr="blk_client_data" />
+        <setvar symbol="blk_client0_data_paddr" region_paddr="blk_client_data" />
     </protection_domain>
 
     <protection_domain name="client" priority="1">
         <program_image path="client.elf" />
 
         <!-- The client should not be able to write to the config page -->
-        <map mr="blk_client_config" vaddr="0x40_000_000" perms="r" cached="false" setvar_vaddr="blk_config" />
+        <map mr="blk_client_config" vaddr="0x40_000_000" perms="r" cached="false" setvar_vaddr="blk_storage_info" />
 
         <map mr="blk_client_request" vaddr="0x40_200_000" perms="rw" cached="false" setvar_vaddr="blk_request" />
         <map mr="blk_client_response" vaddr="0x40_400_000" perms="rw" cached="false" setvar_vaddr="blk_response" />