Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

retire PUBLIC, PRIVATE and FORWARD

Browse Source
This commit is contained in:
Ben Gras
2012-03-25 20:25:53 +02:00
parent 6a73e85ad1
commit 7336a67dfe
603 changed files with 5776 additions and 5779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/random/main.c
View File

@@ -15,21 +15,21 @@
#define KRANDOM_PERIOD 1 /* ticks between krandom calls */
PRIVATE struct device m_geom[NR_DEVS]; /* base and size of each device */
PRIVATE dev_t m_device; /* current device */
static struct device m_geom[NR_DEVS]; /* base and size of each device */
static dev_t m_device; /* current device */
extern int errno; /* error number for PM calls */
FORWARD struct device *r_prepare(dev_t device);
FORWARD int r_transfer(endpoint_t endpt, int opcode, u64_t position,
static struct device *r_prepare(dev_t device);
static int r_transfer(endpoint_t endpt, int opcode, u64_t position,
iovec_t *iov, unsigned int nr_req, endpoint_t user_endpt, unsigned int
flags);
FORWARD int r_do_open(message *m_ptr);
FORWARD void r_random(message *m_ptr);
FORWARD void r_updatebin(int source, struct k_randomness_bin *rb);
static int r_do_open(message *m_ptr);
static void r_random(message *m_ptr);
static void r_updatebin(int source, struct k_randomness_bin *rb);
/* Entry points to this driver. */
PRIVATE struct chardriver r_dtab = {
static struct chardriver r_dtab = {
r_do_open, /* open or mount */
do_nop, /* nothing on a close */
nop_ioctl, /* no I/O controls supported */
@@ -44,16 +44,16 @@ PRIVATE struct chardriver r_dtab = {
/* Buffer for the /dev/random number generator. */
#define RANDOM_BUF_SIZE 1024
PRIVATE char random_buf[RANDOM_BUF_SIZE];
static char random_buf[RANDOM_BUF_SIZE];
/* SEF functions and variables. */
FORWARD void sef_local_startup(void);
FORWARD int sef_cb_init_fresh(int type, sef_init_info_t *info);
static void sef_local_startup(void);
static int sef_cb_init_fresh(int type, sef_init_info_t *info);
/*===========================================================================*
* main *
*===========================================================================*/
PUBLIC int main(void)
int main(void)
{
/* SEF local startup. */
sef_local_startup();
@@ -67,7 +67,7 @@ PUBLIC int main(void)
/*===========================================================================*
* sef_local_startup *
*===========================================================================*/
PRIVATE void sef_local_startup()
static void sef_local_startup()
{
/* Register init callbacks. */
sef_setcb_init_fresh(sef_cb_init_fresh);
@@ -85,7 +85,7 @@ PRIVATE void sef_local_startup()
/*===========================================================================*
* sef_cb_init_fresh *
*===========================================================================*/
PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
{
/* Initialize the random driver. */
static struct k_randomness krandom;
@@ -122,7 +122,7 @@ PRIVATE int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
/*===========================================================================*
* r_prepare *
*===========================================================================*/
PRIVATE struct device *r_prepare(dev_t device)
static struct device *r_prepare(dev_t device)
{
/* Prepare for I/O on a device: check if the minor device number is ok. */
@@ -135,7 +135,7 @@ PRIVATE struct device *r_prepare(dev_t device)
/*===========================================================================*
* r_transfer *
*===========================================================================*/
PRIVATE int r_transfer(
static int r_transfer(
endpoint_t endpt, /* endpoint of grant owner */
int opcode, /* DEV_GATHER or DEV_SCATTER */
u64_t position, /* offset on device to read or write */
@@ -212,7 +212,7 @@ PRIVATE int r_transfer(
/*===========================================================================*
* r_do_open *
*===========================================================================*/
PRIVATE int r_do_open(message *m_ptr)
static int r_do_open(message *m_ptr)
{
/* Check device number on open.
*/
@@ -239,7 +239,7 @@ PRIVATE int r_do_open(message *m_ptr)
/*===========================================================================*
* r_updatebin *
*===========================================================================*/
PRIVATE void r_updatebin(int source, struct k_randomness_bin *rb)
static void r_updatebin(int source, struct k_randomness_bin *rb)
{
int r_next, r_size, r_high;
@@ -265,7 +265,7 @@ PRIVATE void r_updatebin(int source, struct k_randomness_bin *rb)
/*===========================================================================*
* r_random *
*===========================================================================*/
PRIVATE void r_random(message *UNUSED(m_ptr))
static void r_random(message *UNUSED(m_ptr))
{
/* Fetch random information from the kernel to update /dev/random. */
int s;

38
drivers/random/random.c
View File

@@ -25,20 +25,20 @@ that data into a seed for a psuedo random number generator.
* re-seed.
*/
PRIVATE unsigned long deriv[TOTAL_SOURCES][N_DERIV];
PRIVATE int pool_ind[TOTAL_SOURCES];
PRIVATE SHA256_CTX pool_ctx[NR_POOLS];
PRIVATE unsigned samples= 0;
PRIVATE int got_seeded= 0;
PRIVATE u8_t random_key[2*AES_BLOCKSIZE];
PRIVATE u32_t count_lo, count_hi;
PRIVATE u32_t reseed_count;
static unsigned long deriv[TOTAL_SOURCES][N_DERIV];
static int pool_ind[TOTAL_SOURCES];
static SHA256_CTX pool_ctx[NR_POOLS];
static unsigned samples= 0;
static int got_seeded= 0;
static u8_t random_key[2*AES_BLOCKSIZE];
static u32_t count_lo, count_hi;
static u32_t reseed_count;
FORWARD void add_sample(int source, unsigned long sample);
FORWARD void data_block(rd_keyinstance *keyp, void *data);
FORWARD void reseed(void);
static void add_sample(int source, unsigned long sample);
static void data_block(rd_keyinstance *keyp, void *data);
static void reseed(void);
PUBLIC void random_init()
void random_init()
{
int i, j;
@@ -58,14 +58,14 @@ PUBLIC void random_init()
reseed_count= 0;
}
PUBLIC int random_isseeded()
int random_isseeded()
{
if (got_seeded)
return 1;
return 0;
}
PUBLIC void random_update(source, buf, count)
void random_update(source, buf, count)
int source;
rand_t *buf;
int count;
@@ -82,7 +82,7 @@ int count;
reseed();
}
PUBLIC void random_getbytes(buf, size)
void random_getbytes(buf, size)
void *buf;
size_t size;
{
@@ -116,7 +116,7 @@ size_t size;
data_block(&key, random_key+AES_BLOCKSIZE);
}
PUBLIC void random_putbytes(buf, size)
void random_putbytes(buf, size)
void *buf;
size_t size;
{
@@ -131,7 +131,7 @@ size_t size;
reseed();
}
PRIVATE void add_sample(source, sample)
static void add_sample(source, sample)
int source;
unsigned long sample;
{
@@ -182,7 +182,7 @@ unsigned long sample;
pool_ind[source]= pool_nr;
}
PRIVATE void data_block(keyp, data)
static void data_block(keyp, data)
rd_keyinstance *keyp;
void *data;
{
@@ -207,7 +207,7 @@ void *data;
count_hi++;
}
PRIVATE void reseed()
static void reseed()
{
int i;
SHA256_CTX ctx;