Hopefully fix the remaining red from 15e52374

  (imx233, ipodnano2g, !multidrive hosted/sims)

Change-Id: I9c89887078f9f50d3aac73f468ac323699e1fd1f

5 files changed, 9 insertions, 9 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 2328784c96..a101097004 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1792,7 +1792,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
     simplelist_addline("Firmware: %s", info.revision);
     simplelist_addline(
             "Size: %lld MB", (uint64_t)(info.num_sectors*(info.sector_size/512)/2048));
-    storage_t free;
+    sector_t free;
     volume_size( IF_MV(0,) NULL, &free );
     simplelist_addline(
              "Free: %ld MB", free / 1024);
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 622280d487..61e8a70ecd 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -185,7 +185,7 @@ static int refresh_data(struct info_data *info)
 	    max = drive;
 	else if (drive < max)
 	    break;
-#elif defined(HAVE_MULTIVOLUME)
+#elif defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA)
         if (volume_partition(i) == -1)
             break;
 #endif
diff --git a/firmware/target/arm/imx233/partitions-imx233.c b/firmware/target/arm/imx233/partitions-imx233.c
index 965f98dca5..69d0ba4199 100644
--- a/firmware/target/arm/imx233/partitions-imx233.c
+++ b/firmware/target/arm/imx233/partitions-imx233.c
@@ -71,7 +71,7 @@ static const char *creative_part_name(enum imx233_part_t part)
 }
 
 static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, sector_t *start, unsigned *end)
+    enum imx233_part_t part, sector_t *start, sector_t *end)
 {
     uint8_t mblk[512];
     int ret = read_fn(user, MBLK_ADDR / 512, 1, mblk);
@@ -99,7 +99,7 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
             }
             else
                 *end = *start + ent[i].size * hdr->block_size / 512;
-            
+
             return 0;
         }
     }
@@ -109,7 +109,7 @@ static int compute_window_creative(intptr_t user, part_read_fn_t read_fn,
 
 #if (IMX233_PARTITIONS & IMX233_FREESCALE)
 static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, unsigned *start, unsigned *end)
+    enum imx233_part_t part, sector_t *start, sector_t *end)
 {
     uint8_t mbr[512];
     int ret = read_fn(user, 0, 1, mbr);
@@ -179,7 +179,7 @@ static int compute_window_freescale(intptr_t user, part_read_fn_t read_fn,
 #endif /* (IMX233_PARTITIONS & IMX233_FREESCALE) */
 
 int imx233_partitions_compute_window(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, unsigned *start, unsigned *end)
+    enum imx233_part_t part, sector_t *start, sector_t *end)
 {
     int ret = -1;
 #if (IMX233_PARTITIONS & IMX233_CREATIVE)
diff --git a/firmware/target/arm/imx233/partitions-imx233.h b/firmware/target/arm/imx233/partitions-imx233.h
index 4c8f703c2d..edc6c1b2f4 100644
--- a/firmware/target/arm/imx233/partitions-imx233.h
+++ b/firmware/target/arm/imx233/partitions-imx233.h
@@ -55,6 +55,6 @@ bool imx233_partitions_is_window_enabled(void);
  * for a whole disk, *end should be the size of the disk when the function is
  * called */
 int imx233_partitions_compute_window(intptr_t user, part_read_fn_t read_fn,
-    enum imx233_part_t part, sector_t *start, unsigned *end);
+    enum imx233_part_t part, sector_t *start, sector_t *end);
 
 #endif /* __PARTITIONS_IMX233__ */
diff --git a/firmware/target/arm/imx233/sdmmc-imx233.c b/firmware/target/arm/imx233/sdmmc-imx233.c
index 5577c6002d..02f59a50f4 100644
--- a/firmware/target/arm/imx233/sdmmc-imx233.c
+++ b/firmware/target/arm/imx233/sdmmc-imx233.c
@@ -203,8 +203,8 @@ struct sdmmc_status_t
  * the RCA is the 16-bit msb. Be careful that this is not the actuall RCA ! */
 
 /* common */
-static unsigned window_start[SDMMC_NUM_DRIVES];
-static unsigned window_end[SDMMC_NUM_DRIVES];
+static sector_t window_start[SDMMC_NUM_DRIVES];
+static sector_t window_end[SDMMC_NUM_DRIVES];
 static uint8_t aligned_buffer[SDMMC_NUM_DRIVES][512] CACHEALIGN_ATTR;
 static tCardInfo sdmmc_card_info[SDMMC_NUM_DRIVES];
 static struct mutex mutex[SDMMC_NUM_DRIVES];