Messages in this thread Patch in this message | | | Subject | PATCH: resync externs, add execute command remove is_flashcard | Date | Tue, 18 Feb 2003 18:18:03 +0000 (GMT) | From | Alan Cox <> |
| |
(is_flashcard is unneeded outside ide_probe as we have a drive->flash check)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/include/linux/ide.h linux-2.5.61-ac2/include/linux/ide.h --- linux-2.5.61/include/linux/ide.h 2003-02-10 18:38:20.000000000 +0000 +++ linux-2.5.61-ac2/include/linux/ide.h 2003-02-18 18:02:56.000000000 +0000 @@ -1131,12 +1115,13 @@ struct ide_settings_s *next; } ide_settings_t; -void ide_add_setting(ide_drive_t *drive, const char *name, int rw, int read_ioctl, int write_ioctl, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set); -void ide_remove_setting(ide_drive_t *drive, char *name); -ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name); -int ide_read_setting(ide_drive_t *t, ide_settings_t *setting); -int ide_write_setting(ide_drive_t *drive, ide_settings_t *setting, int val); -void ide_add_generic_settings(ide_drive_t *drive); +extern struct semaphore ide_setting_sem; +extern int ide_add_setting(ide_drive_t *drive, const char *name, int rw, int read_ioctl, int write_ioctl, int data_type, int min, int max, int mul_factor, int div_factor, void *data, ide_procset_t *set); +extern void ide_remove_setting(ide_drive_t *drive, char *name); +extern ide_settings_t *ide_find_setting_by_name(ide_drive_t *drive, char *name); +extern int ide_read_setting(ide_drive_t *t, ide_settings_t *setting); +extern int ide_write_setting(ide_drive_t *drive, ide_settings_t *setting, int val); +extern void ide_add_generic_settings(ide_drive_t *drive); /* * /proc/ide interface @@ -1270,12 +1255,19 @@ extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); /* - * This is used on exit from the driver, to designate the next irq handler + * This is used on exit from the driver to designate the next irq handler * and also to start the safety timer. */ extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry); /* + * This is used on exit from the driver to designate the next irq handler + * and start the safety time safely and atomically from the IRQ handler + * with respect to the command issue (which it also does) + */ +extern void ide_execute_command(ide_drive_t *, task_ioreg_t cmd, ide_handler_t *, unsigned int, ide_expiry_t *); + +/* * Error reporting, in human readable form (luxurious, but a memory hog). * * (drive, msg, status) @@ -1577,14 +1569,6 @@ */ extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout); -/* - * CompactFlash cards and their brethern pretend to be removable hard disks, - * but they never have a slave unit, and they don't have doorlock mechanisms. - * This test catches them, and is invoked elsewhere when setting appropriate - * config bits. - */ -extern int drive_is_flashcard (ide_drive_t *drive); - extern int ide_spin_wait_hwgroup(ide_drive_t *); extern void ide_timer_expiry(unsigned long); extern void ide_intr(int irq, void *dev_id, struct pt_regs *regs); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |