mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2026-09-20 20:54:18 +08:00
Convert to using "bool".
This commit is contained in:
@@ -18,10 +18,6 @@
|
||||
#ifndef _RTEMS_BDBUF_H
|
||||
#define _RTEMS_BDBUF_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <rtems.h>
|
||||
#include <rtems/libio.h>
|
||||
#include <rtems/chain.h>
|
||||
@@ -29,6 +25,11 @@ extern "C" {
|
||||
#include "rtems/blkdev.h"
|
||||
#include "rtems/diskdevs.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* State of a buffer in the cache.
|
||||
*/
|
||||
@@ -94,7 +95,7 @@ typedef struct rtems_bdbuf_pool
|
||||
rtems_id lock; /*< The pool lock. Lock this data and
|
||||
* all BDs. */
|
||||
rtems_id sync_lock; /*< Sync calls lock writes. */
|
||||
boolean sync_active; /*< True if a sync is active. */
|
||||
bool sync_active; /*< True if a sync is active. */
|
||||
rtems_id sync_requester; /*< The sync requester. */
|
||||
dev_t sync_device; /*< The device to sync */
|
||||
|
||||
|
||||
+52
-52
@@ -117,7 +117,7 @@ typedef struct rtems_bdbuf_context {
|
||||
rtems_bdbuf_pool* pool; /*< Table of buffer pools */
|
||||
int npools; /*< Number of entries in pool table */
|
||||
rtems_id swapout; /*< Swapout task ID */
|
||||
boolean swapout_enabled;
|
||||
bool swapout_enabled;
|
||||
} rtems_bdbuf_context;
|
||||
|
||||
/**
|
||||
@@ -191,7 +191,7 @@ static rtems_bdbuf_context rtems_bdbuf_ctx;
|
||||
* @return int The number of bytes written to the output.
|
||||
*/
|
||||
#if RTEMS_BDBUF_TRACE
|
||||
boolean rtems_bdbuf_tracer;
|
||||
bool rtems_bdbuf_tracer;
|
||||
static void
|
||||
rtems_bdbuf_printf (const char *format, ...)
|
||||
{
|
||||
@@ -268,7 +268,7 @@ rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root,
|
||||
rtems_bdbuf_buffer* buf_stack[RTEMS_BDBUF_AVL_MAX_HEIGHT];
|
||||
rtems_bdbuf_buffer** buf_prev = buf_stack;
|
||||
|
||||
boolean modified = FALSE;
|
||||
bool modified = false;
|
||||
|
||||
if (p == NULL)
|
||||
{
|
||||
@@ -315,7 +315,7 @@ rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root,
|
||||
|
||||
q->avl.left = q->avl.right = NULL;
|
||||
q->avl.bal = 0;
|
||||
modified = TRUE;
|
||||
modified = true;
|
||||
buf_prev--;
|
||||
|
||||
while (modified)
|
||||
@@ -326,7 +326,7 @@ rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root,
|
||||
{
|
||||
case 1:
|
||||
p->avl.bal = 0;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
break;
|
||||
|
||||
case 0:
|
||||
@@ -354,7 +354,7 @@ rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root,
|
||||
p = p2;
|
||||
}
|
||||
p->avl.bal = 0;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -367,7 +367,7 @@ rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root,
|
||||
{
|
||||
case -1:
|
||||
p->avl.bal = 0;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
break;
|
||||
|
||||
case 0:
|
||||
@@ -395,7 +395,7 @@ rtems_bdbuf_avl_insert(rtems_bdbuf_buffer** root,
|
||||
p = p2;
|
||||
}
|
||||
p->avl.bal = 0;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -451,7 +451,7 @@ rtems_bdbuf_avl_remove(rtems_bdbuf_buffer** root,
|
||||
rtems_bdbuf_buffer* buf_stack[RTEMS_BDBUF_AVL_MAX_HEIGHT];
|
||||
rtems_bdbuf_buffer** buf_prev = buf_stack;
|
||||
|
||||
boolean modified = FALSE;
|
||||
bool modified = false;
|
||||
|
||||
memset (buf_stack, 0, sizeof(buf_stack));
|
||||
|
||||
@@ -555,7 +555,7 @@ rtems_bdbuf_avl_remove(rtems_bdbuf_buffer** root,
|
||||
*root = q;
|
||||
}
|
||||
|
||||
modified = TRUE;
|
||||
modified = true;
|
||||
|
||||
while (modified)
|
||||
{
|
||||
@@ -578,7 +578,7 @@ rtems_bdbuf_avl_remove(rtems_bdbuf_buffer** root,
|
||||
break;
|
||||
case 0:
|
||||
p->avl.bal = 1;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
break;
|
||||
|
||||
case +1:
|
||||
@@ -592,7 +592,7 @@ rtems_bdbuf_avl_remove(rtems_bdbuf_buffer** root,
|
||||
if (p1->avl.bal == 0)
|
||||
{
|
||||
p1->avl.bal = -1;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -633,7 +633,7 @@ rtems_bdbuf_avl_remove(rtems_bdbuf_buffer** root,
|
||||
|
||||
case 0:
|
||||
p->avl.bal = -1;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
break;
|
||||
|
||||
case -1:
|
||||
@@ -646,7 +646,7 @@ rtems_bdbuf_avl_remove(rtems_bdbuf_buffer** root,
|
||||
if (p1->avl.bal == 0)
|
||||
{
|
||||
p1->avl.bal = 1;
|
||||
modified = FALSE;
|
||||
modified = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -934,7 +934,7 @@ rtems_bdbuf_initialize_pool (rtems_bdbuf_pool_config* config,
|
||||
pool->blksize = config->size;
|
||||
pool->nblks = config->num;
|
||||
pool->flags = 0;
|
||||
pool->sync_active = FALSE;
|
||||
pool->sync_active = false;
|
||||
pool->sync_device = -1;
|
||||
pool->sync_requester = 0;
|
||||
pool->tree = NULL;
|
||||
@@ -1135,7 +1135,7 @@ rtems_bdbuf_init (void)
|
||||
* Create and start swapout task
|
||||
*/
|
||||
|
||||
rtems_bdbuf_ctx.swapout_enabled = TRUE;
|
||||
rtems_bdbuf_ctx.swapout_enabled = true;
|
||||
|
||||
sc = rtems_task_create (rtems_build_name('B', 'S', 'W', 'P'),
|
||||
(rtems_bdbuf_configuration.swapout_priority ?
|
||||
@@ -1221,11 +1221,11 @@ static rtems_bdbuf_buffer*
|
||||
rtems_bdbuf_get_buffer (rtems_disk_device* pdd,
|
||||
rtems_bdbuf_pool* pool,
|
||||
rtems_blkdev_bnum block,
|
||||
boolean read_ahead)
|
||||
bool read_ahead)
|
||||
{
|
||||
dev_t device = pdd->dev;
|
||||
rtems_bdbuf_buffer* bd;
|
||||
boolean available;
|
||||
bool available;
|
||||
|
||||
/*
|
||||
* Loop until we get a buffer. Under load we could find no buffers are
|
||||
@@ -1363,7 +1363,7 @@ rtems_bdbuf_get_buffer (rtems_disk_device* pdd,
|
||||
* Loop waiting for the buffer to enter the cached state. If the buffer is in
|
||||
* the access or transfer state then wait until it is not.
|
||||
*/
|
||||
available = FALSE;
|
||||
available = false;
|
||||
while (!available)
|
||||
{
|
||||
switch (bd->state)
|
||||
@@ -1371,7 +1371,7 @@ rtems_bdbuf_get_buffer (rtems_disk_device* pdd,
|
||||
case RTEMS_BDBUF_STATE_CACHED:
|
||||
case RTEMS_BDBUF_STATE_MODIFIED:
|
||||
case RTEMS_BDBUF_STATE_READ_AHEAD:
|
||||
available = TRUE;
|
||||
available = true;
|
||||
break;
|
||||
|
||||
case RTEMS_BDBUF_STATE_ACCESS:
|
||||
@@ -1457,7 +1457,7 @@ rtems_bdbuf_get (dev_t device,
|
||||
rtems_bdbuf_printf ("get: %d (dev = %08x)\n", block, device);
|
||||
#endif
|
||||
|
||||
bd = rtems_bdbuf_get_buffer (dd->phys_dev, pool, block, FALSE);
|
||||
bd = rtems_bdbuf_get_buffer (dd->phys_dev, pool, block, false);
|
||||
|
||||
if (bd->state == RTEMS_BDBUF_STATE_MODIFIED)
|
||||
bd->state = RTEMS_BDBUF_STATE_ACCESS_MODIFIED;
|
||||
@@ -1588,7 +1588,7 @@ rtems_bdbuf_read (dev_t device,
|
||||
*/
|
||||
bd = rtems_bdbuf_get_buffer (dd->phys_dev, pool,
|
||||
block + req->bufnum,
|
||||
req->bufnum == 0 ? FALSE : TRUE);
|
||||
req->bufnum == 0 ? false : true);
|
||||
|
||||
/*
|
||||
* Read ahead buffer is in the cache or none available. Read what we
|
||||
@@ -1838,7 +1838,7 @@ rtems_status_code
|
||||
rtems_bdbuf_sync (rtems_bdbuf_buffer* bd)
|
||||
{
|
||||
rtems_bdbuf_pool* pool;
|
||||
boolean available;
|
||||
bool available;
|
||||
|
||||
#if RTEMS_BDBUF_TRACE
|
||||
rtems_bdbuf_printf ("sync: %d\n", bd->block);
|
||||
@@ -1857,7 +1857,7 @@ rtems_bdbuf_sync (rtems_bdbuf_buffer* bd)
|
||||
|
||||
rtems_bdbuf_wake_swapper ();
|
||||
|
||||
available = FALSE;
|
||||
available = false;
|
||||
while (!available)
|
||||
{
|
||||
switch (bd->state)
|
||||
@@ -1867,7 +1867,7 @@ rtems_bdbuf_sync (rtems_bdbuf_buffer* bd)
|
||||
case RTEMS_BDBUF_STATE_MODIFIED:
|
||||
case RTEMS_BDBUF_STATE_ACCESS:
|
||||
case RTEMS_BDBUF_STATE_ACCESS_MODIFIED:
|
||||
available = TRUE;
|
||||
available = true;
|
||||
break;
|
||||
|
||||
case RTEMS_BDBUF_STATE_SYNC:
|
||||
@@ -1936,7 +1936,7 @@ rtems_bdbuf_syncdev (dev_t dev)
|
||||
* The swap out task will negate the sync active flag when no more buffers
|
||||
* for the device are held on the modified for sync queues.
|
||||
*/
|
||||
pool->sync_active = TRUE;
|
||||
pool->sync_active = true;
|
||||
pool->sync_requester = rtems_task_self ();
|
||||
pool->sync_device = dev;
|
||||
|
||||
@@ -1985,9 +1985,9 @@ rtems_bdbuf_write_done(void *arg, rtems_status_code status, int error)
|
||||
* device of the first buffer to be written to disk.
|
||||
* @param chain The modified chain to process.
|
||||
* @param transfer The chain to append buffers to be written too.
|
||||
* @param sync_active If TRUE this is a sync operation so expire all timers.
|
||||
* @param update_timers If TRUE update the timers.
|
||||
* @param timer_delta It update_timers is TRUE update the timers by this
|
||||
* @param sync_active If true this is a sync operation so expire all timers.
|
||||
* @param update_timers If true update the timers.
|
||||
* @param timer_delta It update_timers is true update the timers by this
|
||||
* amount.
|
||||
*/
|
||||
static void
|
||||
@@ -1995,8 +1995,8 @@ rtems_bdbuf_swapout_modified_processing (rtems_bdpool_id pid,
|
||||
dev_t* dev,
|
||||
rtems_chain_control* chain,
|
||||
rtems_chain_control* transfer,
|
||||
boolean sync_active,
|
||||
boolean update_timers,
|
||||
bool sync_active,
|
||||
bool update_timers,
|
||||
uint32_t timer_delta)
|
||||
{
|
||||
if (!rtems_chain_is_empty (chain))
|
||||
@@ -2099,25 +2099,25 @@ rtems_bdbuf_swapout_modified_processing (rtems_bdpool_id pid,
|
||||
* the buffers are beign written to disk.
|
||||
*
|
||||
* @param pid The pool id to process modified buffers on.
|
||||
* @param timer_delta It update_timers is TRUE update the timers by this
|
||||
* @param timer_delta It update_timers is true update the timers by this
|
||||
* amount.
|
||||
* @param update_timers If TRUE update the timers.
|
||||
* @param update_timers If true update the timers.
|
||||
* @param write_req The write request structure. There is only one.
|
||||
*
|
||||
* @retval TRUE Buffers where written to disk so scan again.
|
||||
* @retval FALSE No buffers where written to disk.
|
||||
* @retval true Buffers where written to disk so scan again.
|
||||
* @retval false No buffers where written to disk.
|
||||
*/
|
||||
static boolean
|
||||
static bool
|
||||
rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
unsigned long timer_delta,
|
||||
boolean update_timers,
|
||||
bool update_timers,
|
||||
rtems_blkdev_request* write_req)
|
||||
{
|
||||
rtems_bdbuf_pool* pool = rtems_bdbuf_get_pool (pid);
|
||||
rtems_chain_control transfer;
|
||||
dev_t dev = -1;
|
||||
rtems_disk_device* dd;
|
||||
boolean transfered_buffers = TRUE;
|
||||
bool transfered_buffers = true;
|
||||
|
||||
rtems_chain_initialize_empty (&transfer);
|
||||
|
||||
@@ -2137,7 +2137,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
*/
|
||||
rtems_bdbuf_swapout_modified_processing (pid, &dev,
|
||||
&pool->sync, &transfer,
|
||||
TRUE, FALSE,
|
||||
true, false,
|
||||
timer_delta);
|
||||
|
||||
/*
|
||||
@@ -2160,7 +2160,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
* If there are buffers to transfer to the media tranfer them.
|
||||
*/
|
||||
if (rtems_chain_is_empty (&transfer))
|
||||
transfered_buffers = FALSE;
|
||||
transfered_buffers = false;
|
||||
else
|
||||
{
|
||||
/*
|
||||
@@ -2169,7 +2169,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
*/
|
||||
dd = rtems_disk_obtain (dev);
|
||||
if (dd == NULL)
|
||||
transfered_buffers = FALSE;
|
||||
transfered_buffers = false;
|
||||
else
|
||||
{
|
||||
/*
|
||||
@@ -2197,7 +2197,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
rtems_bdbuf_buffer* bd =
|
||||
(rtems_bdbuf_buffer*) rtems_chain_get (&transfer);
|
||||
|
||||
boolean write = FALSE;
|
||||
bool write = true;
|
||||
|
||||
/*
|
||||
* If the device only accepts sequential buffers and this is not the
|
||||
@@ -2211,7 +2211,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
(bd->block != (last_block + 1)))
|
||||
{
|
||||
rtems_chain_prepend (&transfer, &bd->link);
|
||||
write = TRUE;
|
||||
write = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2230,7 +2230,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
|
||||
if (rtems_chain_is_empty (&transfer) ||
|
||||
(write_req->bufnum >= rtems_bdbuf_configuration.max_write_blocks))
|
||||
write = TRUE;
|
||||
write = true;
|
||||
|
||||
if (write)
|
||||
{
|
||||
@@ -2310,7 +2310,7 @@ rtems_bdbuf_swapout_pool_processing (rtems_bdpool_id pid,
|
||||
if (pool->sync_active && ! transfered_buffers)
|
||||
{
|
||||
rtems_id sync_requester = pool->sync_requester;
|
||||
pool->sync_active = FALSE;
|
||||
pool->sync_active = false;
|
||||
pool->sync_requester = 0;
|
||||
if (sync_requester)
|
||||
rtems_event_send (sync_requester, RTEMS_BDBUF_TRANSFER_SYNC);
|
||||
@@ -2367,20 +2367,20 @@ rtems_bdbuf_swapout_task (rtems_task_argument arg)
|
||||
/*
|
||||
* Only update the timers once in the processing cycle.
|
||||
*/
|
||||
boolean update_timers = TRUE;
|
||||
bool update_timers = true;
|
||||
|
||||
/*
|
||||
* If we write buffers to any disk perform a check again. We only write a
|
||||
* single device at a time and a pool may have more than one devices
|
||||
* buffers modified waiting to be written.
|
||||
*/
|
||||
boolean transfered_buffers;
|
||||
bool transfered_buffers;
|
||||
|
||||
do
|
||||
{
|
||||
rtems_bdpool_id pid;
|
||||
|
||||
transfered_buffers = FALSE;
|
||||
transfered_buffers = false;
|
||||
|
||||
/*
|
||||
* Loop over each pool extacting all the buffers we find for a specific
|
||||
@@ -2394,14 +2394,14 @@ rtems_bdbuf_swapout_task (rtems_task_argument arg)
|
||||
update_timers,
|
||||
write_req))
|
||||
{
|
||||
transfered_buffers = TRUE;
|
||||
transfered_buffers = true;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Only update the timers once.
|
||||
*/
|
||||
update_timers = FALSE;
|
||||
update_timers = false;
|
||||
}
|
||||
while (transfered_buffers);
|
||||
|
||||
@@ -2440,7 +2440,7 @@ rtems_bdbuf_find_pool (uint32_t block_size, rtems_bdpool_id *pool)
|
||||
rtems_bdbuf_pool* p;
|
||||
rtems_bdpool_id i;
|
||||
rtems_bdpool_id curid = -1;
|
||||
bool found = FALSE;
|
||||
bool found = false;
|
||||
uint32_t cursize = UINT_MAX;
|
||||
int j;
|
||||
|
||||
@@ -2456,7 +2456,7 @@ rtems_bdbuf_find_pool (uint32_t block_size, rtems_bdpool_id *pool)
|
||||
{
|
||||
curid = i;
|
||||
cursize = p->blksize;
|
||||
found = TRUE;
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ static uint32_t disktab_size;
|
||||
static rtems_id diskdevs_mutex;
|
||||
|
||||
/* Flag meaning that disk I/O, buffering etc. already has been initialized. */
|
||||
static boolean disk_io_initialized = FALSE;
|
||||
static bool disk_io_initialized = false;
|
||||
|
||||
/* diskdevs data structures protection flag.
|
||||
* Normally, only table lookup operations performed. It is quite fast, so
|
||||
@@ -257,12 +257,12 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
|
||||
rc = rtems_semaphore_obtain(diskdevs_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
return rc;
|
||||
diskdevs_protected = TRUE;
|
||||
diskdevs_protected = true;
|
||||
|
||||
rc = rtems_bdbuf_find_pool(block_size, &pool);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
{
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
return rc;
|
||||
}
|
||||
@@ -270,7 +270,7 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
|
||||
rc = create_disk(dev, name, &dd);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
{
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
return rc;
|
||||
}
|
||||
@@ -291,7 +291,7 @@ rtems_disk_create_phys(dev_t dev, int block_size, int disk_size,
|
||||
&dd->capabilities) < 0)
|
||||
dd->capabilities = 0;
|
||||
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
|
||||
return rc;
|
||||
@@ -335,12 +335,12 @@ rtems_disk_create_log(dev_t dev, dev_t phys, int start, int size, char *name)
|
||||
rc = rtems_semaphore_obtain(diskdevs_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
return rc;
|
||||
diskdevs_protected = TRUE;
|
||||
diskdevs_protected = true;
|
||||
|
||||
pdd = get_disk_entry(phys);
|
||||
if (pdd == NULL)
|
||||
{
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
return RTEMS_INVALID_NUMBER;
|
||||
}
|
||||
@@ -348,7 +348,7 @@ rtems_disk_create_log(dev_t dev, dev_t phys, int start, int size, char *name)
|
||||
rc = create_disk(dev, name, &dd);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
{
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
return rc;
|
||||
}
|
||||
@@ -363,7 +363,7 @@ rtems_disk_create_log(dev_t dev, dev_t phys, int start, int size, char *name)
|
||||
|
||||
rc = rtems_io_register_name(name, major, minor);
|
||||
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rc = rtems_semaphore_release(diskdevs_mutex);
|
||||
|
||||
return rc;
|
||||
@@ -394,7 +394,7 @@ rtems_disk_delete(dev_t dev)
|
||||
rc = rtems_semaphore_obtain(diskdevs_mutex, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
return rc;
|
||||
diskdevs_protected = TRUE;
|
||||
diskdevs_protected = true;
|
||||
|
||||
/* Check if this device is in use -- calculate usage counter */
|
||||
used = 0;
|
||||
@@ -414,7 +414,7 @@ rtems_disk_delete(dev_t dev)
|
||||
|
||||
if (used != 0)
|
||||
{
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
return RTEMS_RESOURCE_IN_USE;
|
||||
}
|
||||
@@ -439,7 +439,7 @@ rtems_disk_delete(dev_t dev)
|
||||
}
|
||||
}
|
||||
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rc = rtems_semaphore_release(diskdevs_mutex);
|
||||
return rc;
|
||||
}
|
||||
@@ -469,10 +469,10 @@ rtems_disk_obtain(dev_t dev)
|
||||
RTEMS_NO_TIMEOUT);
|
||||
if (rc != RTEMS_SUCCESSFUL)
|
||||
return NULL;
|
||||
diskdevs_protected = TRUE;
|
||||
diskdevs_protected = true;
|
||||
dd = get_disk_entry(dev);
|
||||
dd->uses++;
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rtems_semaphore_release(diskdevs_mutex);
|
||||
return dd;
|
||||
}
|
||||
@@ -531,7 +531,7 @@ rtems_disk_next(dev_t dev)
|
||||
return NULL;
|
||||
|
||||
dtab = disktab + major;
|
||||
while (TRUE)
|
||||
while (true)
|
||||
{
|
||||
if ((dtab == NULL) || (minor > dtab->size))
|
||||
{
|
||||
@@ -573,7 +573,7 @@ rtems_disk_io_initialize(void)
|
||||
if (disktab == NULL)
|
||||
return RTEMS_NO_MEMORY;
|
||||
|
||||
diskdevs_protected = FALSE;
|
||||
diskdevs_protected = false;
|
||||
rc = rtems_semaphore_create(
|
||||
rtems_build_name('D', 'D', 'E', 'V'), 1,
|
||||
RTEMS_FIFO | RTEMS_BINARY_SEMAPHORE | RTEMS_NO_INHERIT_PRIORITY |
|
||||
|
||||
@@ -89,7 +89,7 @@ get_sector(dev_t dev, uint32_t sector_num, rtems_sector_data_t **sector)
|
||||
* sector - sector to check
|
||||
*
|
||||
* RETURNS:
|
||||
* TRUE if sector has msdos signature, FALSE otherwise
|
||||
* true if sector has msdos signature, false otherwise
|
||||
*/
|
||||
static bool
|
||||
msdos_signature_check (rtems_sector_data_t *sector)
|
||||
@@ -109,7 +109,7 @@ msdos_signature_check (rtems_sector_data_t *sector)
|
||||
* type - type of partition to check
|
||||
*
|
||||
* RETURNS:
|
||||
* TRUE if partition type is extended, FALSE otherwise
|
||||
* true if partition type is extended, false otherwise
|
||||
*/
|
||||
static bool
|
||||
is_extended(uint8_t type)
|
||||
@@ -125,7 +125,7 @@ is_extended(uint8_t type)
|
||||
* type - type of partition to check
|
||||
*
|
||||
* RETURNS:
|
||||
* TRUE if partition type is extended, FALSE otherwise
|
||||
* true if partition type is extended, false otherwise
|
||||
*/
|
||||
static bool
|
||||
is_fat_partition(uint8_t type)
|
||||
|
||||
@@ -248,22 +248,22 @@ ramdisk_initialize(
|
||||
r->block_num = c->block_num;
|
||||
if (c->location == NULL)
|
||||
{
|
||||
r->malloced = TRUE;
|
||||
r->malloced = true;
|
||||
r->area = malloc(r->block_size * r->block_num);
|
||||
if (r->area == NULL) /* No enough memory for this disk */
|
||||
{
|
||||
r->initialized = FALSE;
|
||||
r->initialized = false;
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
r->initialized = TRUE;
|
||||
r->initialized = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
r->malloced = FALSE;
|
||||
r->initialized = TRUE;
|
||||
r->malloced = false;
|
||||
r->initialized = true;
|
||||
r->area = c->location;
|
||||
}
|
||||
rc = rtems_disk_create_phys(dev, c->block_size, c->block_num,
|
||||
@@ -274,7 +274,7 @@ ramdisk_initialize(
|
||||
{
|
||||
free(r->area);
|
||||
}
|
||||
r->initialized = FALSE;
|
||||
r->initialized = false;
|
||||
}
|
||||
}
|
||||
nramdisks = rtems_ramdisk_configuration_size;
|
||||
|
||||
@@ -48,24 +48,24 @@
|
||||
#include <inttypes.h>
|
||||
|
||||
typedef struct {
|
||||
boolean bdbuf_modified;
|
||||
boolean bdbuf_in_progress;
|
||||
boolean bdbuf_actual;
|
||||
boolean bdbuf_used;
|
||||
boolean bdbuf_all;
|
||||
bool bdbuf_modified;
|
||||
bool bdbuf_in_progress;
|
||||
bool bdbuf_actual;
|
||||
bool bdbuf_used;
|
||||
bool bdbuf_all;
|
||||
rtems_bdpool_id pool_id;
|
||||
} show_bdbuf_filter_t;
|
||||
|
||||
typedef struct {
|
||||
boolean show_all;
|
||||
boolean show_node_chain;
|
||||
boolean show_dev;
|
||||
boolean show_blocknum;
|
||||
boolean show_error;
|
||||
boolean show_state;
|
||||
boolean show_use_count;
|
||||
boolean show_pool_id;
|
||||
boolean show_sema;
|
||||
bool show_all;
|
||||
bool show_node_chain;
|
||||
bool show_dev;
|
||||
bool show_blocknum;
|
||||
bool show_error;
|
||||
bool show_state;
|
||||
bool show_use_count;
|
||||
bool show_pool_id;
|
||||
bool show_sema;
|
||||
} show_bdbuf_selector_t;
|
||||
|
||||
typedef enum {bdbuf_chain_ident_none,
|
||||
@@ -81,9 +81,9 @@ typedef struct {
|
||||
blkdev_bnum blknum;
|
||||
rtems_status_code status;
|
||||
int error;
|
||||
boolean modified;
|
||||
boolean in_progress;
|
||||
boolean actual;
|
||||
bool modified;
|
||||
bool in_progress;
|
||||
bool actual;
|
||||
int use_count;
|
||||
const CORE_mutex_Control *sema;
|
||||
} show_bdbuf_bdbuf_info_t;
|
||||
@@ -122,7 +122,7 @@ rtems_status_code rtems_bdbuf_show_follow_chain_node_to_head
|
||||
{
|
||||
rtems_status_code rc = RTEMS_SUCCESSFUL;
|
||||
preemption_key_t preempt_key;
|
||||
boolean preempt_disabled = FALSE;
|
||||
bool preempt_disabled = false;
|
||||
/*
|
||||
* disable preemption
|
||||
*/
|
||||
@@ -226,9 +226,9 @@ rtems_status_code rtems_bdbuf_show_getargs
|
||||
* set filter and selector to default
|
||||
*/
|
||||
memset(filter,0,sizeof(*filter));
|
||||
filter->bdbuf_all = TRUE;
|
||||
filter->bdbuf_all = true;
|
||||
memset(selector,0,sizeof(*selector));
|
||||
selector->show_all = TRUE;
|
||||
selector->show_all = true;
|
||||
|
||||
/*
|
||||
* scan arguments
|
||||
@@ -245,61 +245,61 @@ rtems_status_code rtems_bdbuf_show_getargs
|
||||
* selection, which bdbufs to show
|
||||
*/
|
||||
case 'm': /* only show bdbufs modified */
|
||||
filter->bdbuf_modified = TRUE ;
|
||||
filter->bdbuf_all = FALSE;
|
||||
filter->bdbuf_modified = true ;
|
||||
filter->bdbuf_all = false;
|
||||
break;
|
||||
case 'i': /* only show bdbufs in progress*/
|
||||
filter->bdbuf_in_progress = TRUE ;
|
||||
filter->bdbuf_all = FALSE;
|
||||
filter->bdbuf_in_progress = true ;
|
||||
filter->bdbuf_all = false;
|
||||
break;
|
||||
case 'v': /* only show bdbufs, which have valid data*/
|
||||
filter->bdbuf_actual = TRUE ;
|
||||
filter->bdbuf_all = FALSE;
|
||||
filter->bdbuf_actual = true ;
|
||||
filter->bdbuf_all = false;
|
||||
break;
|
||||
case 'u': /* only show bdbufs, which are in use */
|
||||
filter->bdbuf_used = TRUE ;
|
||||
filter->bdbuf_all = FALSE;
|
||||
filter->bdbuf_used = true ;
|
||||
filter->bdbuf_all = false;
|
||||
break;
|
||||
case 'p': /* only show bdbufs, which belong to pool <n> */
|
||||
filter->pool_id = strtol(argv[i]+2,&tmp_ptr,0);
|
||||
if (tmp_ptr == argv[i]+2) { /* no conversion performed... */
|
||||
arg_error = i;
|
||||
}
|
||||
filter->bdbuf_all = FALSE;
|
||||
filter->bdbuf_all = false;
|
||||
break;
|
||||
/*
|
||||
* selection, what fields to show
|
||||
*/
|
||||
case 'n': /* show bdbuf node_chain */
|
||||
selector->show_node_chain = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_node_chain = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 'd': /* show device */
|
||||
selector->show_dev = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_dev = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 'b': /* show blocknum */
|
||||
selector->show_blocknum = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_blocknum = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 'e': /* show bdbuf error status */
|
||||
selector->show_error = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_error = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 's': /* show bdbuf state */
|
||||
selector->show_state = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_state = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 'c': /* show bdbuf use count */
|
||||
selector->show_use_count = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_use_count = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 'l': /* show bdbuf pool id */
|
||||
selector->show_pool_id = TRUE ;
|
||||
selector->show_all = FALSE;
|
||||
selector->show_pool_id = true ;
|
||||
selector->show_all = false;
|
||||
break;
|
||||
case 't': /* show bdbuf transfer sema */
|
||||
selector->show_sema = TRUE ;
|
||||
selector->show_sema = true ;
|
||||
break;
|
||||
default:
|
||||
arg_error = i;
|
||||
@@ -496,7 +496,7 @@ rtems_status_code rtems_show_bdbuf_match_filter
|
||||
\*-------------------------------------------------------------------------*/
|
||||
const show_bdbuf_bdbuf_info_t *bdbuf_info, /* struct to store info of bdbuf */
|
||||
const show_bdbuf_filter_t *filter,
|
||||
boolean *is_match
|
||||
bool *is_match
|
||||
)
|
||||
/*-------------------------------------------------------------------------*\
|
||||
| Return Value: |
|
||||
@@ -505,11 +505,11 @@ rtems_status_code rtems_show_bdbuf_match_filter
|
||||
{
|
||||
|
||||
rtems_status_code rc = RTEMS_SUCCESSFUL;
|
||||
boolean unmatch = FALSE;
|
||||
bool unmatch = false;
|
||||
|
||||
if (rc == RTEMS_SUCCESSFUL) {
|
||||
if (filter->bdbuf_all) {
|
||||
unmatch = FALSE;
|
||||
unmatch = false;
|
||||
}
|
||||
else {
|
||||
unmatch = ((filter->bdbuf_modified && !bdbuf_info->modified) ||
|
||||
@@ -594,7 +594,7 @@ rtems_status_code rtems_show_bdbuf_print
|
||||
\*-------------------------------------------------------------------------*/
|
||||
const show_bdbuf_bdbuf_info_t *bdbuf_info, /* info of bdbuf */
|
||||
show_bdbuf_selector_t * selector, /* selector, what to show */
|
||||
boolean print_header /* TRUE: print header, not info */
|
||||
bool print_header /* true: print header, not info */
|
||||
)
|
||||
/*-------------------------------------------------------------------------*\
|
||||
| Return Value: |
|
||||
@@ -748,7 +748,7 @@ void rtems_bdbuf_show_fnc
|
||||
int argc,
|
||||
char **argv,
|
||||
rtems_monitor_command_arg_t* command_arg,
|
||||
boolean verbose
|
||||
bool verbose
|
||||
)
|
||||
/*-------------------------------------------------------------------------*\
|
||||
| Return Value: |
|
||||
@@ -763,7 +763,7 @@ void rtems_bdbuf_show_fnc
|
||||
bdbuf_pool *curr_pool,*pool_base;
|
||||
int pool_cnt,pool_idx;
|
||||
int bdbuf_idx;
|
||||
boolean bdbuf_matches;
|
||||
bool bdbuf_matches;
|
||||
int matched_cnt,un_matched_cnt;
|
||||
|
||||
/*
|
||||
@@ -806,7 +806,7 @@ void rtems_bdbuf_show_fnc
|
||||
*/
|
||||
if (rc == RTEMS_SUCCESSFUL) {
|
||||
rc = rtems_show_bdbuf_print(NULL,&selector,
|
||||
TRUE);
|
||||
true);
|
||||
}
|
||||
/*
|
||||
* for all bdbufs in this pool
|
||||
@@ -838,7 +838,7 @@ void rtems_bdbuf_show_fnc
|
||||
if (rc == RTEMS_SUCCESSFUL) {
|
||||
if (bdbuf_matches) {
|
||||
rc = rtems_show_bdbuf_print(&bdbuf_info,&selector,
|
||||
FALSE);
|
||||
false);
|
||||
if ((rc == RTEMS_SUCCESSFUL) &&
|
||||
selector.show_sema) {
|
||||
rc = rtems_show_bdbuf_print_wait_chain(&(curr_pool->bdbufs[bdbuf_idx]));
|
||||
|
||||
Reference in New Issue
Block a user