diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2024-11-12 07:58:00 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2024-11-12 08:11:18 -0500 |
| commit | 3d1dcebebb833b4059d3f3c40b3f1d788ce6fa1f (patch) | |
| tree | eca50d310855711ab0839b2b6f51db09223ac5b1 | |
| parent | cb7b6fd572b2855455f4ba5d29145bfc3f3d0d63 (diff) | |
| download | rockbox-3d1dcebebb.tar.gz rockbox-3d1dcebebb.zip | |
ipod6g: Wrap more DMA functionality with HAVE_ATA_DMA
No functional change.
We always have it turned in for ipod6g, but this makes some of the
flow/logic easier to follow.
Change-Id: I3abeace4f70afb197e819e0944e0e76f4edc4800
| -rw-r--r-- | firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c index 4fc6489d48..3aff2edd49 100644 --- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c @@ -71,7 +71,6 @@ static uint64_t ata_total_sectors; static uint32_t log_sector_size; static struct mutex ata_mutex; static struct semaphore ata_wakeup; -static uint32_t ata_dma_flags; static long ata_last_activity_value = -1; static long ata_sleep_timeout = 7 * HZ; static bool ata_powered; @@ -79,7 +78,10 @@ static bool canflush = true; static struct semaphore mmc_wakeup; static struct semaphore mmc_comp_wakeup; static int spinup_time = 0; +#ifdef HAVE_ATA_DMA static int dma_mode = 0; +static uint32_t ata_dma_flags; +#endif static const int ata_retries = ATA_RETRIES; static const bool ata_error_srst = true; @@ -656,7 +658,9 @@ static int ata_power_up(void) if (ceata) { ata_lba48 = true; ata_dma = true; +#ifdef HAVE_ATA_DMA dma_mode = 0xff; /* Canary */ +#endif PCON(8) = 0x33333333; PCON(9) = 0x00000033; PCON(11) |= 0xf; @@ -711,8 +715,8 @@ static int ata_power_up(void) ATA_PIO_TIME = piotime; uint32_t param = 0; - ata_dma_flags = 0; #ifdef HAVE_ATA_DMA + ata_dma_flags = 0; if ((identify_info[53] & BIT(2)) && (identify_info[88] & BITRANGE(0, 4))) /* Any UDMA */ { int max_udma = ATA_MAX_UDMA; @@ -730,9 +734,9 @@ static int ata_power_up(void) ATA_MDMA_TIME = mwdmatimes[param & 0xf]; ata_dma_flags = BIT(3) | BIT(10); } + dma_mode = param; #endif /* HAVE_ATA_DMA */ ata_dma = param ? true : false; - dma_mode = param; PASS_RC(ata_set_feature(0x03, param), 3, 4); /* Transfer mode */ /* SET_FEATURE only supported on PATA, not CE-ATA */ @@ -1145,7 +1149,7 @@ int ata_init(void) /* get identify_info */ mutex_lock(&ata_mutex); - int rc = ata_power_up(); /* Include identify() call */ + int rc = ata_power_up(); /* Includes identify() call */ mutex_unlock(&ata_mutex); if (IS_ERR(rc)) return rc; |