Mirrors_Framework/rtems
1
0 Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-11-09 08:37:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove stray white spaces.

Browse Source
This commit is contained in:
Ralf Corsepius committed 2004-04-15 14:50:20 +00:00
1 parent 1f788a3e28
commit 048dcd2b3a
8 files changed
+148 -148
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cpukit/libblock/include/rtems/bdbuf.h
+1 -1
View File
@@ -48,7 +48,7 @@ typedef struct bdbuf_buffer {
dev_t dev; /* device number */
blkdev_bnum block; /* block number on the device */
char *buffer; /* Pointer to the buffer memory area */
rtems_status_code status; /* Last I/O operation completion status */
int error; /* If status != RTEMS_SUCCESSFUL, this field contains
cpukit/libblock/include/rtems/blkdev.h
+1 -1
View File
@@ -69,7 +69,7 @@ typedef struct blkdev_request {
blkdev_bnum start; /* Start block number */
uint32_t count; /* Number of blocks to be exchanged */
uint32_t bufnum; /* Number of buffers provided */
blkdev_sg_buffer bufs[0];/* List of scatter/gather buffers */
} blkdev_request;
cpukit/libblock/include/rtems/diskdevs.h
+1 -1
View File
@@ -157,7 +157,7 @@ rtems_disk_lookup(dev_t dev);
*/
rtems_status_code
rtems_disk_release(disk_device *dd);
/* rtems_disk_next --
* Disk device enumerator. Looking for device having device number larger
* than dev and return disk device descriptor for it. If there are no
cpukit/libblock/src/bdbuf.c
+60 -60
View File
File diff suppressed because it is too large. Load diff
cpukit/libblock/src/blkdev.c
+29 -29
View File
@@ -39,28 +39,28 @@ rtems_blkdev_generic_read(
unsigned int blkofs;
dev_t dev;
disk_device *dd;
dev = rtems_filesystem_make_dev_t(major, minor);
dd = rtems_disk_lookup(dev);
if (dd == NULL)
return RTEMS_INVALID_NUMBER;
block_size_log2 = dd->block_size_log2;
block_size = dd->block_size;
buf = args->buffer;
count = args->count;
args->bytes_moved = 0;
block = args->offset >> block_size_log2;
blkofs = args->offset & (block_size - 1);
while (count > 0)
{
bdbuf_buffer *diskbuf;
int copy;
rtems_status_code rc;
rc = rtems_bdbuf_read(dev, block, &diskbuf);
if (rc != RTEMS_SUCCESSFUL)
return rc;
@@ -100,44 +100,44 @@ rtems_blkdev_generic_write(
dev_t dev;
rtems_status_code rc;
disk_device *dd;
dev = rtems_filesystem_make_dev_t(major, minor);
dd = rtems_disk_lookup(dev);
if (dd == NULL)
return RTEMS_INVALID_NUMBER;
block_size_log2 = dd->block_size_log2;
block_size = dd->block_size;
buf = args->buffer;
count = args->count;
args->bytes_moved = 0;
block = args->offset >> block_size_log2;
blkofs = args->offset & (block_size - 1);
while (count > 0)
{
bdbuf_buffer *diskbuf;
int copy;
if ((blkofs == 0) && (count >= block_size))
rc = rtems_bdbuf_get(dev, block, &diskbuf);
else
rc = rtems_bdbuf_read(dev, block, &diskbuf);
if (rc != RTEMS_SUCCESSFUL)
return rc;
copy = block_size - blkofs;
if (copy > count)
copy = count;
memcpy((char *)diskbuf->buffer + blkofs, buf, copy);
args->bytes_moved += copy;
rc = rtems_bdbuf_release_modified(diskbuf);
if (rc != RTEMS_SUCCESSFUL)
return rc;
count -= copy;
buf += copy;
blkofs = 0;
@@ -157,16 +157,16 @@ rtems_blkdev_generic_open(
{
dev_t dev;
disk_device *dd;
dev = rtems_filesystem_make_dev_t(major, minor);
dd = rtems_disk_lookup(dev);
if (dd == NULL)
return RTEMS_INVALID_NUMBER;
dd->uses++;
rtems_disk_release(dd);
return RTEMS_SUCCESSFUL;
}
@@ -182,16 +182,16 @@ rtems_blkdev_generic_close(
{
dev_t dev;
disk_device *dd;
dev = rtems_filesystem_make_dev_t(major, minor);
dd = rtems_disk_lookup(dev);
if (dd == NULL)
return RTEMS_INVALID_NUMBER;
dd->uses--;
rtems_disk_release(dd);
return RTEMS_SUCCESSFUL;
}
@@ -208,18 +208,18 @@ rtems_blkdev_generic_ioctl(
dev_t dev;
disk_device *dd;
int rc;
dev = rtems_filesystem_make_dev_t(major, minor);
dd = rtems_disk_lookup(dev);
if (dd == NULL)
return RTEMS_INVALID_NUMBER;
switch (args->command)
{
case BLKIO_GETBLKSIZE:
args->ioctl_return = dd->block_size;
break;
case BLKIO_GETSIZE:
args->ioctl_return = dd->size;
break;
@@ -228,7 +228,7 @@ rtems_blkdev_generic_ioctl(
rc = rtems_bdbuf_syncdev(dd->dev);
args->ioctl_return = (rc == RTEMS_SUCCESSFUL ? 0 : -1);
break;
case BLKIO_REQUEST:
{
blkdev_request *req = args->buffer;
@@ -237,13 +237,13 @@ rtems_blkdev_generic_ioctl(
req);
break;
}
default:
args->ioctl_return = dd->ioctl(dd->phys_dev->dev, args->command,
args->buffer);
break;
}
rtems_disk_release(dd);
return RTEMS_SUCCESSFUL;
}
cpukit/libblock/src/diskdevs.c
+34 -34
View File
File diff suppressed because it is too large. Load diff
cpukit/libblock/src/ide_part_table.c
+14 -14
View File
@@ -51,7 +51,7 @@ get_sector(dev_t dev, uint32_t sector_num, sector_data_t **sector)
sector_data_t *s;
bdbuf_buffer *buf;
rtems_status_code rc;
if (sector == NULL)
{
return RTEMS_INTERNAL_ERROR;
@@ -62,21 +62,21 @@ get_sector(dev_t dev, uint32_t sector_num, sector_data_t **sector)
{
return RTEMS_NO_MEMORY;
}
rc = rtems_bdbuf_read(dev, sector_num, &buf);
if (rc != RTEMS_SUCCESSFUL)
{
free(s);
return rc;
}
memcpy(s->data, buf->buffer, RTEMS_IDE_SECTOR_SIZE);
s->sector_num = sector_num;
*sector = s;
rtems_bdbuf_release(buf);
return RTEMS_SUCCESSFUL;
}
@@ -165,7 +165,7 @@ data_to_part_desc(uint8_t *data, part_desc_t **new_part_desc)
{
return RTEMS_INTERNAL_ERROR;
}
*new_part_desc = NULL;
if ((part_desc = calloc(1, sizeof(part_desc_t))) == NULL)
@@ -233,7 +233,7 @@ read_extended_partition(uint32_t start, part_desc_t *ext_part)
{
return RTEMS_INTERNAL_ERROR;
}
dev = ext_part->disk_desc->dev;
/* get start sector of current extended partition */
@@ -267,7 +267,7 @@ read_extended_partition(uint32_t start, part_desc_t *ext_part)
free(sector);
return rc;
}
if (new_part_desc == NULL)
{
data += RTEMS_IDE_PARTITION_DESCRIPTOR_SIZE;
@@ -296,7 +296,7 @@ read_extended_partition(uint32_t start, part_desc_t *ext_part)
}
free(sector);
return RTEMS_SUCCESSFUL;
}
@@ -367,7 +367,7 @@ read_mbr(disk_desc_t *disk_desc)
}
free(sector);
disk_desc->last_log_id = RTEMS_IDE_PARTITION_MAX_SUB_PARTITION_NUMBER;
/* There cannot be more than one extended partition,
@@ -404,7 +404,7 @@ partition_free(part_desc_t *part_desc)
if (part_desc == NULL)
return;
if (is_extended(part_desc->sys_type))
{
for (part_num = 0;
@@ -414,7 +414,7 @@ partition_free(part_desc_t *part_desc)
partition_free(part_desc->sub_part[part_num]);
}
}
free(part_desc);
}
@@ -437,7 +437,7 @@ rtems_ide_part_table_free(disk_desc_t *disk_desc)
{
partition_free(disk_desc->partitions[part_num]);
}
free(disk_desc);
}
@@ -508,7 +508,7 @@ rtems_ide_part_table_initialize(char *dev_name)
{
return RTEMS_NO_MEMORY;
}
/* get partition table */
rc = rtems_ide_part_table_get(dev_name, disk_desc);
if (rc != RTEMS_SUCCESSFUL)
cpukit/libblock/src/ramdisk.c
+8 -8
View File
@@ -54,7 +54,7 @@ ramdisk_read(struct ramdisk *rd, blkdev_request *req)
uint32_t i;
blkdev_sg_buffer *sg;
uint32_t remains;
from = (char *)rd->area + (req->start * rd->block_size);
remains = rd->block_size * req->count;
sg = req->bufs;
@@ -89,7 +89,7 @@ ramdisk_write(struct ramdisk *rd, blkdev_request *req)
uint32_t i;
blkdev_sg_buffer *sg;
uint32_t remains;
to = (char *)rd->area + (req->start * rd->block_size);
remains = rd->block_size * req->count;
sg = req->bufs;
@@ -134,9 +134,9 @@ ramdisk_ioctl(dev_t dev, int req, void *argp)
errno = ENODEV;
return -1;
}
rd = ramdisk + minor;
switch (r->req)
{
case BLKDEV_REQ_READ:
@@ -144,14 +144,14 @@ ramdisk_ioctl(dev_t dev, int req, void *argp)
case BLKDEV_REQ_WRITE:
return ramdisk_write(rd, r);
default:
errno = EBADRQC;
return -1;
}
break;
}
default:
errno = EBADRQC;
return -1;
@@ -184,10 +184,10 @@ ramdisk_initialize(
rc = rtems_disk_io_initialize();
if (rc != RTEMS_SUCCESSFUL)
return rc;
r = ramdisk = calloc(rtems_ramdisk_configuration_size,
sizeof(struct ramdisk));
for (i = 0; i < rtems_ramdisk_configuration_size; i++, c++, r++)
{
dev_t dev = rtems_filesystem_make_dev_t(major, i);