On Wednesday 11 March 2009, Sergei Shtylyov wrote: > Bartlomiej Zolnierkiewicz wrote: > > >>Add support for the CompactFlash specific PIO modes 5/6 and MWDMA modes 3/4. > > >>Since there were no PIO5 capable hard drives produced and one would also need > >>66 MHz IDE clock to actually get the difference WRT the address setup timings > >>programmed, I decided to simply replace the old non-standard PIO mode 5 timings > >>with the CFA specified ones. > > >>Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> > > >>--- > >>Changes since the previous take: > >>- added check for CFA modes to 'sl82c105' driver; > >>- added identify word 163 copying to ide_driveid_update(); > >>- made change based on just posted ide_config_drive_speed() fixlet... > > > applied fixing checkpatch.pl complaint while at it: > > > ERROR: space prohibited after that open parenthesis '(' > > #199: FILE: drivers/ide/sl82c105.c:64: > > + if ( (pio > 2 || ata_id_has_iordy(drive->id)) && ] > > Sigh, that one was done on purpose... :-] > > >>--- linux-2.6.orig/drivers/ide/sl82c105.c > >>+++ linux-2.6/drivers/ide/sl82c105.c > >>@@ -61,7 +61,8 @@ static unsigned int get_pio_timings(ide_ > >> if (cmd_off == 0) > >> cmd_off = 1; > >> > >>- if (pio > 2 || ata_id_has_iordy(drive->id)) > >>+ if ( (pio > 2 || ata_id_has_iordy(drive->id)) && > >>+ !(pio > 4 && ata_id_is_cfa(drive->id))) > >> iordy = 0x40; > > > I guess that it would later make sense to abstract this code into > > ata_id_needs_iordy(id, pio) helper + > > Er, if we can't reuse libata's stuff, I'd prefer to put this into We can't reuse libata's ata_pio_need_iordy() since it resides in libata-core.c and also checks controller's capabilities. > <linux/ide.h> as ide_dev_use_iordy()... Also fine with me, though I see no reason why not to move it to <linux/ata.h> so libata guys can use it inside ata_pio_need_iordy(). Thanks, Bart -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html