Mercurial > ecos
view packages/io/disk/current/include/diskio.h @ 2300:654c837cc618
* include/disk.h (DISK_CHANNEL): No need for extra _part_dev
slot intended for entire disk's own devtab.
* src/disk.c (disk_lookup): Just access pdevs_dev directly
with no adjusted offset.
(disk_init): No longer set entry 0 from device devtab.
It's unnecessary.
* include/disk.h: Merge eCosCentric CVS with public eCos CVS.
This merges (and therefore changes) the API. ChangeLog
entries have been incorporated in the correct places below.
* include/diskio.h: Also merged.
* cdl/io_disk.cdl: Also merged.
* src/disk.c: Also merged.
* src/disk.c (read_partition): Switched to favour LBA partition
information in partition tables. This also means we don't now rely
on the driver reporting a correct CHS size for the disk.
(disk_bread, disk_bwrite): API changed to take length in sectors
rather than bytes. Also call hardware driver to transfer in
(up to) max_transfer sized chunks, rather than a sector at a
time. Call in to driver now made with DSR lock claimed, to avoid a
race condition between the DSR and the calling thread.
(disk_get_config): Added phys_block_size to channel info.
* include/diskio.h (struct cyg_disk_identify_t): Added
phys_block_size and max_transfer fields. These must be filled in
by the driver.
* include/disk.h (DISK_CHANNEL_INIT): New macro. Allows a
DISK_CHANNEL to be defined dynamically.
* src/disk.c (disk_bread, disk_bwrite): Made calls to
cyg_thread_yield() dependent on presence ok kernel.
* src/disk.c (disk_bwrite): Uncomment the cyg_thread_yield() at
the end to prevent thread starvation between threads at the same
priority.
(disk_bread): Ditto.
* src/disk.c (read_partition): Changed to account for very large
disks which report bogus CHS geometry. We can only use the LBA
partition parameters in such disks.
(disk_set_config): Added some extra debug output.
* src/disk.c:
Various changes to support disconnect/reconnect of changeable
media.
* include/diskio.h: Added mount counter to disk_info structure.
* include/disk.h: Changed disk_disconnected() function to take a
pointer to a struct disk_channel rather than a struct
cyg_devtab_entry. Added mount count to disk_channel structure.
Moved include of diskio.h to end to fix declaration problems.
* src/disk.c: Fixed bug in write routine where controller result
field was not being initialized. Added signals on controller queue
condition variable after setting controller busy flag to false.
* include/disk.h: Made controller result and busy fields
volatile. Just in case.
* include/disk.h:
* src/disk.c:
Many changes. Added additional disk_controller data structure to
better reflect hardware structure. Added support for serialization
of multithreaded accesses to a single controller. Added support
for asynchronous, interrupt driven, IO operations. Various
tidies.
| author | jlarmour |
|---|---|
| date | Thu, 21 Sep 2006 16:38:38 +0000 |
| parents | b1d2762b2eec |
| children | 21a641579915 |
line wrap: on
line source
#ifndef CYGONCE_DISKIO_H #define CYGONCE_DISKIO_H // ==================================================================== // // diskio.h // // Device I/O // // ==================================================================== //####ECOSGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of eCos, the Embedded Configurable Operating System. // Copyright (C) 2003 Savin Zlobec // Copyright (C) 2004, 2006 eCosCentric Limited // // eCos is free software; you can redistribute it and/or modify it under // the terms of the GNU General Public License as published by the Free // Software Foundation; either version 2 or (at your option) any later version. // // eCos is distributed in the hope that it will be useful, but WITHOUT ANY // WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. // // You should have received a copy of the GNU General Public License along // with eCos; if not, write to the Free Software Foundation, Inc., // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. // // As a special exception, if other files instantiate templates or use macros // or inline functions from this file, or you compile this file and link it // with other works to produce a work based on this file, this file does not // by itself cause the resulting work to be covered by the GNU General Public // License. However the source code for this file must still be made available // in accordance with section (3) of the GNU General Public License. // // This exception does not invalidate any other reasons why a work based on // this file might be covered by the GNU General Public License. // // ------------------------------------------- //####ECOSGPLCOPYRIGHTEND#### // ==================================================================== //#####DESCRIPTIONBEGIN#### // // Author(s): savin // Date: 2003-06-09 // Purpose: Special support for disk I/O devices // Description: // //####DESCRIPTIONEND#### // // ==================================================================== // This file contains the user-level visible I/O interfaces #include <pkgconf/hal.h> #include <cyg/infra/cyg_type.h> #include <cyg/io/config_keys.h> #include <cyg/io/devtab.h> #ifdef __cplusplus extern "C" { #endif struct cyg_disk_identify_t { char serial[20+1]; // serial number char firmware_rev[8+1]; // firmware revision char model_num[40+1]; // model number cyg_uint32 cylinders_num; // number of cylinders (CHS) cyg_uint32 heads_num; // number of heads (CHS) cyg_uint32 sectors_num; // number of sectors per track (CHS) cyg_uint32 lba_sectors_num; // total number of sectors in LBA mode cyg_uint32 phys_block_size; // physical block size in sectors cyg_uint32 max_transfer; // Maximum transfer size in bytes }; struct cyg_disk_partition_t { cyg_uint8 type; // partition type cyg_uint8 state; // state 0x00 - inactive, 0x80 - active cyg_uint32 start; // first sector number cyg_uint32 end; // last sector number cyg_uint32 size; // size in sectors }; struct cyg_disk_info_t { cyg_disk_partition_t *partitions; // partition table int partitions_num;// partition table size cyg_disk_identify_t ident; // identify data cyg_uint32 block_size; // logical block size cyg_uint32 blocks_num; // number of blocks on disk cyg_uint32 phys_block_size; // physical block size cyg_bool connected; // true if device connected cyg_ucount16 mounts; // total number of mounts for all partitions }; #ifdef __cplusplus } #endif #endif /* CYGONCE_DISKIO_H */ /* EOF diskio.h */
