Changeset 7baa484 in rtems for cpukit/libblock
- Timestamp:
- 06/12/09 01:53:33 (15 years ago)
- Branches:
- 4.10, 4.11, 5, master
- Children:
- 72755421
- Parents:
- 9e06eb1
- Location:
- cpukit/libblock/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
cpukit/libblock/src/bdbuf.c
r9e06eb1 r7baa484 1937 1937 * there are buffers to be written. If the transfer fails place the buffers 1938 1938 * back on the modified list and try again later. The pool is unlocked while 1939 * the buffers are bei gnwritten to disk.1939 * the buffers are being written to disk. 1940 1940 * 1941 1941 * @param pid The pool id to process modified buffers on. … … 1966 1966 /* 1967 1967 * When the sync is for a device limit the sync to that device. If the sync 1968 * is for a buffer handle the devices in the order on the sync list. This1969 * means the dev is -1.1968 * is for a buffer handle process the devices in the order on the sync 1969 * list. This means the dev is -1. 1970 1970 */ 1971 1971 if (pool->sync_active) … … 1973 1973 1974 1974 /* 1975 * If we have any buffers in the sync queue move the nto the modified1975 * If we have any buffers in the sync queue move them to the modified 1976 1976 * list. The first sync buffer will select the device we use. 1977 1977 */ … … 1991 1991 1992 1992 /* 1993 * We have all the buffers that have been modified for this device so 1994 * the pool can be unlocked because the state is set to TRANSFER.1995 * /1996 1993 * We have all the buffers that have been modified for this device so the 1994 * pool can be unlocked because the state of each buffer has been set to 1995 * TRANSFER. 1996 */ 1997 1997 rtems_bdbuf_unlock_pool (pool); 1998 1998 1999 1999 /* 2000 * If there are buffers to transfer to the media tran fer them.2000 * If there are buffers to transfer to the media transfer them. 2001 2001 */ 2002 2002 if (rtems_chain_is_empty (&transfer)) … … 2005 2005 { 2006 2006 /* 2007 * Obtain the disk device. Release the pool mutex to avoid a dead2008 * lock.2007 * Obtain the disk device. The pool's mutex has been released to avoid a 2008 * dead lock. 2009 2009 */ 2010 2010 dd = rtems_disk_obtain (dev); … … 2021 2021 /* 2022 2022 * Take as many buffers as configured and pass to the driver. Note, the 2023 * API to the drivers has thearray of buffers and if a chain was passed2023 * API to the drivers has an array of buffers and if a chain was passed 2024 2024 * we could have just passed the list. If the driver API is updated it 2025 2025 * should be possible to make this change with little effect in this 2026 2026 * code. The array that is passed is broken in design and should be 2027 * removed. Merging tomembers of a struct into the first member is2027 * removed. Merging members of a struct into the first member is 2028 2028 * trouble waiting to happen. 2029 2029 */ 2030 2031 2030 write_req->status = RTEMS_RESOURCE_IN_USE; 2032 2031 write_req->error = 0; -
cpukit/libblock/src/bdpart.c
r9e06eb1 r7baa484 111 111 } 112 112 113 /* 114 * FIXME: This code should the deviceio interface and not the bdbug interface. 115 */ 113 116 static rtems_status_code rtems_bdpart_get_disk_data( 114 117 const char *disk_name, … … 129 132 return RTEMS_INVALID_NAME; 130 133 } 131 *disk = st.st_ dev;134 *disk = st.st_rdev; 132 135 133 136 /* Get disk begin, end and block size */ -
cpukit/libblock/src/ide_part_table.c
r9e06eb1 r7baa484 468 468 469 469 strncpy (disk_desc->dev_name, dev_name, 15); 470 disk_desc->dev = dev_stat.st_ dev;470 disk_desc->dev = dev_stat.st_rdev; 471 471 disk_desc->sector_size = (dev_stat.st_blksize) ? dev_stat.st_blksize : 472 472 RTEMS_IDE_SECTOR_SIZE;
Note: See TracChangeset
for help on using the changeset viewer.