summaryrefslogtreecommitdiffstats
path: root/cpukit/libblock/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-15 14:50:20 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-15 14:50:20 +0000
commit048dcd2b3a678fc259403b0b83f5caff7b6f4f57 (patch)
tree235c1019757590067e4884a2ec18b7f9b26e7a4d /cpukit/libblock/src
parentRemove stray white spaces. (diff)
downloadrtems-048dcd2b3a678fc259403b0b83f5caff7b6f4f57.tar.bz2
Remove stray white spaces.
Diffstat (limited to 'cpukit/libblock/src')
-rw-r--r--cpukit/libblock/src/bdbuf.c120
-rw-r--r--cpukit/libblock/src/blkdev.c58
-rw-r--r--cpukit/libblock/src/diskdevs.c68
-rw-r--r--cpukit/libblock/src/ide_part_table.c28
-rw-r--r--cpukit/libblock/src/ramdisk.c16
5 files changed, 145 insertions, 145 deletions
diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c
index 1991269385..89cd8bb484 100644
--- a/cpukit/libblock/src/bdbuf.c
+++ b/cpukit/libblock/src/bdbuf.c
@@ -59,7 +59,7 @@ typedef struct bdbuf_pool
struct bdbuf_context {
bdbuf_pool *pool; /* Table of buffer pools */
int npools; /* Number of entries in pool table */
-
+
Chain_Control mod; /* Modified buffers list */
rtems_id flush_sema; /* Buffer flush semaphore; counting
semaphore; incremented when buffer
@@ -93,7 +93,7 @@ typedef rtems_mode preemption_key;
} while (0)
#else
-
+
typedef boolean preemption_key;
#define DISABLE_PREEMPTION(key) \
@@ -101,7 +101,7 @@ typedef boolean preemption_key;
(key) = _Thread_Executing->is_preemptible; \
_Thread_Executing->is_preemptible = 0; \
} while (0)
-
+
#define ENABLE_PREEMPTION(key) \
do { \
_Thread_Executing->is_preemptible = (key); \
@@ -148,7 +148,7 @@ avl_search(bdbuf_buffer **root, dev_t dev, blkdev_bnum block)
p = p->avl.left;
}
}
-
+
return p;
}
@@ -438,7 +438,7 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
break;
}
}
-
+
if (p == NULL)
{
/* there is no such node */
@@ -484,20 +484,20 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
{
t = buf_prev++;
s = r;
-
+
while (s->avl.left != NULL)
{
*buf_prev++ = r = s;
s = r->avl.left;
r->avl.cache = -1;
}
-
+
s->avl.left = q->avl.left;
r->avl.left = s->avl.right;
s->avl.right = q->avl.right;
s->avl.bal = q->avl.bal;
s->avl.cache = 1;
-
+
*t = q = s;
}
}
@@ -530,7 +530,7 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
{
break;
}
-
+
if (p->avl.cache == -1)
{
/* rebalance left branch */
@@ -572,10 +572,10 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
p2->avl.right = p1;
p->avl.right = p2->avl.left;
p2->avl.left = p;
-
+
if (p2->avl.bal == +1) p->avl.bal = -1; else p->avl.bal = 0;
if (p2->avl.bal == -1) p1->avl.bal = 1; else p1->avl.bal = 0;
-
+
p = p2;
p2->avl.bal = 0;
}
@@ -626,7 +626,7 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
p2->avl.left = p1;
p->avl.left = p2->avl.right;
p2->avl.right = p;
-
+
if (p2->avl.bal == -1) p->avl.bal = 1; else p->avl.bal = 0;
if (p2->avl.bal == +1) p1->avl.bal = -1; else p1->avl.bal = 0;
@@ -643,7 +643,7 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
if (buf_prev > buf_stack)
{
q = *(buf_prev - 1);
-
+
if (q->avl.cache == -1)
{
q->avl.left = p;
@@ -660,7 +660,7 @@ avl_remove(bdbuf_buffer **root, const bdbuf_buffer *node)
}
}
-
+
return 0;
}
@@ -683,21 +683,21 @@ bdbuf_initialize_pool(rtems_bdbuf_config *config, int pool)
bdbuf_buffer *b;
rtems_status_code rc;
int i;
-
+
p->blksize = config->size;
p->nblks = config->num;
p->tree = NULL;
-
+
Chain_Initialize_empty(&p->free);
Chain_Initialize_empty(&p->lru);
-
+
/* Allocate memory for buffer descriptors */
p->bdbufs = calloc(config->num, sizeof(bdbuf_buffer));
if (p->bdbufs == NULL)
{
return RTEMS_NO_MEMORY;
}
-
+
/* Allocate memory for buffers if required */
if (config->mem_area == NULL)
{
@@ -713,7 +713,7 @@ bdbuf_initialize_pool(rtems_bdbuf_config *config, int pool)
bufs = config->mem_area;
p->mallocd_bufs = NULL;
}
-
+
for (i = 0, b = p->bdbufs; i < p->nblks; i++, b++, bufs += p->blksize)
{
b->dev = -1; b->block = 0;
@@ -723,7 +723,7 @@ bdbuf_initialize_pool(rtems_bdbuf_config *config, int pool)
b->pool = pool;
_Chain_Append(&p->free, &b->link);
}
-
+
rc = rtems_semaphore_create(
rtems_build_name('B', 'U', 'F', 'G'),
p->nblks,
@@ -731,14 +731,14 @@ bdbuf_initialize_pool(rtems_bdbuf_config *config, int pool)
RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL,
0,
&p->bufget_sema);
-
+
if (rc != RTEMS_SUCCESSFUL)
{
free(p->bdbufs);
free(p->mallocd_bufs);
return rc;
}
-
+
return RTEMS_SUCCESSFUL;
}
@@ -784,7 +784,7 @@ rtems_bdbuf_init(rtems_bdbuf_config *conf_table, int size)
if (size <= 0)
return RTEMS_INVALID_SIZE;
-
+
bd_ctx.npools = size;
/*
@@ -797,7 +797,7 @@ rtems_bdbuf_init(rtems_bdbuf_config *conf_table, int size)
}
Chain_Initialize_empty(&bd_ctx.mod);
-
+
/* Initialize buffer pools and roll out if something failed */
for (i = 0; i < size; i++)
{
@@ -826,7 +826,7 @@ rtems_bdbuf_init(rtems_bdbuf_config *conf_table, int size)
free(bd_ctx.pool);
return rc;
}
-
+
/* Create and start swapout task */
rc = rtems_task_create(
rtems_build_name('B', 'S', 'W', 'P'),
@@ -922,7 +922,7 @@ again:
rtems_semaphore_release(bd_pool->bufget_sema);
}
}
-
+
if (bd_buf == NULL)
{
/* Assign new buffer descriptor */
@@ -1017,7 +1017,7 @@ again:
_CORE_mutex_Seize(&bd_buf->transfer_sema, 0, TRUE,
WATCHDOG_NO_TIMEOUT, level);
}
-
+
*ret_buf = bd_buf;
return RTEMS_SUCCESSFUL;
}
@@ -1059,13 +1059,13 @@ rtems_bdbuf_get(dev_t device, blkdev_bnum block, bdbuf_buffer **bd)
dd = rtems_disk_lookup(device);
if (dd == NULL)
return RTEMS_INVALID_ID;
-
+
if (block >= dd->size)
{
rtems_disk_release(dd);
return RTEMS_INVALID_NUMBER;
}
-
+
pdd = dd->phys_dev;
block += dd->start;
rtems_disk_release(dd);
@@ -1178,7 +1178,7 @@ rtems_bdbuf_read(dev_t device,
{
preemption_key key;
ISR_Level level;
-
+
bdbuf_buffer *bd_buf;
rtems_status_code rc;
int result;
@@ -1189,13 +1189,13 @@ rtems_bdbuf_read(dev_t device,
dd = rtems_disk_lookup(device);
if (dd == NULL)
return RTEMS_INVALID_ID;
-
+
if (block >= dd->size)
{
rtems_disk_release(dd);
return RTEMS_INVALID_NUMBER;
}
-
+
pdd = dd->phys_dev;
block += dd->start;
@@ -1221,7 +1221,7 @@ rtems_bdbuf_read(dev_t device,
req.req.bufnum = 1;
req.req.bufs[0].length = dd->block_size;
req.req.bufs[0].buffer = bd_buf->buffer;
-
+
bdbuf_initialize_transfer_sema(bd_buf);
result = dd->ioctl(pdd->dev, BLKIO_REQUEST, &req);
if (result == -1)
@@ -1240,11 +1240,11 @@ rtems_bdbuf_read(dev_t device,
bd_buf->in_progress = FALSE;
}
rtems_disk_release(dd);
-
+
ENABLE_PREEMPTION(key);
*bd = bd_buf;
-
+
return RTEMS_SUCCESSFUL;
}
@@ -1275,7 +1275,7 @@ bdbuf_release(bdbuf_buffer *bd_buf)
if (bd_buf->use_count <= 0)
return RTEMS_INTERNAL_ERROR;
-
+
bd_pool = bd_ctx.pool + bd_buf->pool;
bd_buf->use_count--;
@@ -1284,7 +1284,7 @@ bdbuf_release(bdbuf_buffer *bd_buf)
{
if (bd_buf->modified)
{
-
+
/* Buffer was modified. Insert buffer to the modified buffers
* list and initiate flushing. */
Chain_Append(&bd_ctx.mod, &bd_buf->link);
@@ -1331,13 +1331,13 @@ rtems_bdbuf_release(bdbuf_buffer *bd_buf)
if (bd_buf == NULL)
return RTEMS_INVALID_ADDRESS;
-
+
DISABLE_PREEMPTION(key);
-
+
rc = bdbuf_release(bd_buf);
-
+
ENABLE_PREEMPTION(key);
-
+
return rc;
}
@@ -1367,7 +1367,7 @@ rtems_bdbuf_release_modified(bdbuf_buffer *bd_buf)
if (bd_buf == NULL)
return RTEMS_INVALID_ADDRESS;
-
+
DISABLE_PREEMPTION(key);
if (!bd_buf->modified)
@@ -1377,9 +1377,9 @@ rtems_bdbuf_release_modified(bdbuf_buffer *bd_buf)
bd_buf->modified = TRUE;
bd_buf->actual = TRUE;
rc = bdbuf_release(bd_buf);
-
+
ENABLE_PREEMPTION(key);
-
+
return rc;
}
@@ -1410,7 +1410,7 @@ rtems_bdbuf_sync(bdbuf_buffer *bd_buf)
if (bd_buf == NULL)
return RTEMS_INVALID_ADDRESS;
-
+
DISABLE_PREEMPTION(key);
if (!bd_buf->modified)
@@ -1428,9 +1428,9 @@ rtems_bdbuf_sync(bdbuf_buffer *bd_buf)
_CORE_mutex_Seize(&bd_buf->transfer_sema, 0, TRUE,
WATCHDOG_NO_TIMEOUT, level);
}
-
+
ENABLE_PREEMPTION(key);
-
+
return rc;
}
@@ -1450,17 +1450,17 @@ rtems_bdbuf_syncdev(dev_t dev)
{
preemption_key key;
ISR_Level level;
-
+
bdbuf_buffer *bd_buf;
disk_device *dd;
bdbuf_pool *pool;
-
+
dd = rtems_disk_lookup(dev);
if (dd == NULL)
return RTEMS_INVALID_ID;
-
+
pool = bd_ctx.pool + dd->pool;
-
+
DISABLE_PREEMPTION(key);
do {
bd_buf = avl_search_for_sync(&pool->tree, dd);
@@ -1497,7 +1497,7 @@ bdbuf_swapout_task(rtems_task_argument unused)
{
rtems_fatal_error_occurred(BLKDEV_FATAL_BDBUF_SWAPOUT);
}
-
+
bd_buf = (bdbuf_buffer *)Chain_Get(&bd_ctx.mod);
if (bd_buf == NULL)
{
@@ -1524,9 +1524,9 @@ bdbuf_swapout_task(rtems_task_argument unused)
/* transfer_sema initialized when bd_buf inserted in the mod chain
first time */
result = dd->ioctl(dd->phys_dev->dev, BLKIO_REQUEST, &req);
-
+
rtems_disk_release(dd);
-
+
if (result == -1)
{
bd_buf->status = RTEMS_IO_ERROR;
@@ -1588,11 +1588,11 @@ rtems_bdbuf_find_pool(int block_size, rtems_bdpool_id *pool)
rtems_bdpool_id curid = -1;
rtems_boolean found = FALSE;
int j;
-
+
for (j = block_size; (j != 0) && ((j & 1) == 0); j >>= 1);
if (j != 1)
return RTEMS_INVALID_SIZE;
-
+
for (i = 0, p = bd_ctx.pool; i < bd_ctx.npools; i++, p++)
{
if ((p->blksize >= block_size) &&
@@ -1603,7 +1603,7 @@ rtems_bdbuf_find_pool(int block_size, rtems_bdpool_id *pool)
found = TRUE;
}
}
-
+
if (found)
{
if (pool != NULL)
@@ -1638,16 +1638,16 @@ rtems_bdbuf_get_pool_info(rtems_bdpool_id pool, int *block_size,
{
if (pool >= bd_ctx.npools)
return RTEMS_INVALID_NUMBER;
-
+
if (block_size != NULL)
{
*block_size = bd_ctx.pool[pool].blksize;
}
-
+
if (blocks != NULL)
{
*blocks = bd_ctx.pool[pool].nblks;
}
-
+
return RTEMS_SUCCESSFUL;
}
diff --git a/cpukit/libblock/src/blkdev.c b/cpukit/libblock/src/blkdev.c
index eab8ba9cd5..f5d7bacc6e 100644
--- a/cpukit/libblock/src/blkdev.c
+++ b/cpukit/libblock/src/blkdev.c
@@ -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;
}
diff --git a/cpukit/libblock/src/diskdevs.c b/cpukit/libblock/src/diskdevs.c
index 569e0f8e6c..7b8d5c631a 100644
--- a/cpukit/libblock/src/diskdevs.c
+++ b/cpukit/libblock/src/diskdevs.c
@@ -72,7 +72,7 @@ create_disk_entry(dev_t dev)
struct disk_device **d;
rtems_filesystem_split_dev_t (dev, major, minor);
-
+
if (major >= disktab_size)
{
struct disk_device_table *p;
@@ -92,7 +92,7 @@ create_disk_entry(dev_t dev)
}
disktab_size = newsize;
}
-
+
if ((disktab[major].minor == NULL) ||
(minor >= disktab[major].size))
{
@@ -100,14 +100,14 @@ create_disk_entry(dev_t dev)
disk_device **p;
int i;
int s = disktab[major].size;
-
+
if (s == 0)
newsize = DISKTAB_INITIAL_SIZE;
else
newsize = s * 2;
if (minor >= newsize)
newsize = minor + 1;
-
+
p = realloc(disktab[major].minor, sizeof(disk_device *) * newsize);
if (p == NULL)
return NULL;
@@ -117,7 +117,7 @@ create_disk_entry(dev_t dev)
*p = NULL;
disktab[major].size = newsize;
}
-
+
d = disktab[major].minor + minor;
if (*d == NULL)
{
@@ -144,15 +144,15 @@ get_disk_entry(dev_t dev)
struct disk_device_table *dtab;
rtems_filesystem_split_dev_t (dev, major, minor);
-
+
if ((major >= disktab_size) || (disktab == NULL))
return NULL;
-
+
dtab = disktab + major;
-
+
if ((minor >= dtab->size) || (dtab->minor == NULL))
return NULL;
-
+
return dtab->minor[minor];
}
@@ -175,13 +175,13 @@ create_disk(dev_t dev, char *name, disk_device **diskdev)
{
disk_device *dd;
char *n;
-
+
dd = get_disk_entry(dev);
if (dd != NULL)
{
return RTEMS_RESOURCE_IN_USE;
}
-
+
if (name == NULL)
{
n = NULL;
@@ -194,19 +194,19 @@ create_disk(dev_t dev, char *name, disk_device **diskdev)
return RTEMS_NO_MEMORY;
strncpy(n, name, nlen);
}
-
+
dd = create_disk_entry(dev);
if (dd == NULL)
{
free(n);
return RTEMS_NO_MEMORY;
}
-
+
dd->dev = dev;
dd->name = n;
-
+
*diskdev = dd;
-
+
return RTEMS_SUCCESSFUL;
}
@@ -247,11 +247,11 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
rtems_filesystem_split_dev_t (dev, major, minor);
-
+
for (bs_log2 = 0, i = block_size; (i & 1) == 0; i >>= 1, bs_log2++);
if ((bs_log2 < 9) || (i != 1)) /* block size < 512 or not power of 2 */
return RTEMS_INVALID_NUMBER;
-
+
rc = rtems_semaphore_obtain(diskdevs_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (rc != RTEMS_SUCCESSFUL)
return rc;
@@ -264,7 +264,7 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
rtems_semaphore_release(diskdevs_mutex);
return rc;
}
-
+
rc = create_disk(dev, name, &dd);
if (rc != RTEMS_SUCCESSFUL)
{
@@ -272,7 +272,7 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
rtems_semaphore_release(diskdevs_mutex);
return rc;
}
-
+
dd->phys_dev = dd;
dd->uses = 0;
dd->start = 0;
@@ -283,7 +283,7 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
dd->pool = pool;
rc = rtems_io_register_name(name, major, minor);
-
+
diskdevs_protected = FALSE;
rtems_semaphore_release(diskdevs_mutex);
@@ -337,7 +337,7 @@ rtems_disk_create_log(dev_t dev, dev_t phys, int start, int size, char *name)
rtems_semaphore_release(diskdevs_mutex);
return RTEMS_INVALID_NUMBER;
}
-
+
rc = create_disk(dev, name, &dd);
if (rc != RTEMS_SUCCESSFUL)
{
@@ -345,7 +345,7 @@ rtems_disk_create_log(dev_t dev, dev_t phys, int start, int size, char *name)
rtems_semaphore_release(diskdevs_mutex);
return rc;
}
-
+
dd->phys_dev = pdd;
dd->uses = 0;
dd->start = start;
@@ -358,7 +358,7 @@ rtems_disk_create_log(dev_t dev, dev_t phys, int start, int size, char *name)
diskdevs_protected = FALSE;
rc = rtems_semaphore_release(diskdevs_mutex);
-
+
return rc;
}
@@ -383,7 +383,7 @@ rtems_disk_delete(dev_t dev)
int used;
rtems_device_major_number maj;
rtems_device_minor_number min;
-
+
rc = rtems_semaphore_obtain(diskdevs_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (rc != RTEMS_SUCCESSFUL)
return rc;
@@ -404,7 +404,7 @@ rtems_disk_delete(dev_t dev)
}
}
}
-
+
if (used != 0)
{
diskdevs_protected = FALSE;
@@ -431,7 +431,7 @@ rtems_disk_delete(dev_t dev)
}
}
}
-
+
diskdevs_protected = FALSE;
rc = rtems_semaphore_release(diskdevs_mutex);
return rc;
@@ -453,7 +453,7 @@ rtems_disk_lookup(dev_t dev)
rtems_interrupt_level level;
disk_device *dd;
rtems_status_code rc;
-
+
rtems_interrupt_disable(level);
if (diskdevs_protected)
{
@@ -522,7 +522,7 @@ rtems_disk_next(dev_t dev)
if (major >= disktab_size)
return NULL;
-
+
dtab = disktab + major;
while (TRUE)
{
@@ -560,7 +560,7 @@ rtems_disk_io_initialize(void)
if (disk_io_initialized)
return RTEMS_SUCCESSFUL;
-
+
disktab_size = DISKTAB_INITIAL_SIZE;
disktab = calloc(disktab_size, sizeof(struct disk_device_table));
if (disktab == NULL)
@@ -571,23 +571,23 @@ rtems_disk_io_initialize(void)
rtems_build_name('D', 'D', 'E', 'V'), 1,
RTEMS_FIFO | RTEMS_BINARY_SEMAPHORE | RTEMS_NO_INHERIT_PRIORITY |
RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL, 0, &diskdevs_mutex);
-
+
if (rc != RTEMS_SUCCESSFUL)
{
free(disktab);
return rc;
}
-
+
rc = rtems_bdbuf_init(rtems_bdbuf_configuration,
rtems_bdbuf_configuration_size);
-
+
if (rc != RTEMS_SUCCESSFUL)
{
rtems_semaphore_delete(diskdevs_mutex);
free(disktab);
return rc;
}
-
+
disk_io_initialized = 1;
return RTEMS_SUCCESSFUL;
}
@@ -628,7 +628,7 @@ rtems_disk_io_done(void)
free(disktab);
rc = rtems_semaphore_release(diskdevs_mutex);
-
+
/* XXX bdbuf should be released too! */
disk_io_initialized = 0;
return rc;
diff --git a/cpukit/libblock/src/ide_part_table.c b/cpukit/libblock/src/ide_part_table.c
index 5a28f0d9a4..2e84ed37a8 100644
--- a/cpukit/libblock/src/ide_part_table.c
+++ b/cpukit/libblock/src/ide_part_table.c
@@ -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)
diff --git a/cpukit/libblock/src/ramdisk.c b/cpukit/libblock/src/ramdisk.c
index be78a8ee31..b54838c62d 100644
--- a/cpukit/libblock/src/ramdisk.c
+++ b/cpukit/libblock/src/ramdisk.c
@@ -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);