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

More use of endpoint_t. Other code cleanup.

Browse Source
This commit is contained in:
Kees van Reeuwijk
2010-03-30 14:07:15 +00:00
parent 2ff73172b4
commit 4865e3f4f9
34 changed files with 120 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/amddev/amddev.c
View File

@@ -56,8 +56,8 @@ static void write_reg(int function, int index, u32_t value);
static void init_domain(int index);
static void init_map(unsigned int ix);
static int do_add4pci(message *m);
static void add_range(u32_t busaddr, u32_t size);
static void del_range(u32_t busaddr, u32_t size);
static void add_range(phys_bytes busaddr, phys_bytes size);
static void del_range(phys_bytes busaddr, phys_bytes size);
static void report_exceptions(void);
/* SEF functions and variables. */
@@ -428,9 +428,9 @@ static int do_add4pci(message *m)
}
static void add_range(u32_t busaddr, u32_t size)
static void add_range(phys_bytes busaddr, phys_bytes size)
{
u32_t o;
phys_bytes o;
#if 0
printf("add_range: mapping 0x%x@0x%x\n", size, busaddr);
@@ -443,9 +443,9 @@ static void add_range(u32_t busaddr, u32_t size)
}
}
static void del_range(u32_t busaddr, u32_t size)
static void del_range(phys_bytes busaddr, phys_bytes size)
{
u32_t o, bit;
phys_bytes o;
#if 0
printf("del_range: mapping 0x%x@0x%x\n", size, busaddr);
@@ -453,7 +453,7 @@ static void del_range(u32_t busaddr, u32_t size)
for (o= 0; o<size; o += I386_PAGE_SIZE)
{
bit= (busaddr+o)/I386_PAGE_SIZE;
u32_t bit= (busaddr+o)/I386_PAGE_SIZE;
table[bit/8] |= (1 << (bit % 8));
}
}

19
drivers/at_wini/at_wini.c
View File

@@ -110,7 +110,7 @@ PRIVATE phys_bytes dma_buf_phys;
PRIVATE struct prdte
{
u32_t prdte_base;
phys_bytes prdte_base;
u16_t prdte_count;
u8_t prdte_reserved;
u8_t prdte_flags;
@@ -145,11 +145,11 @@ FORWARD _PROTOTYPE( int w_identify, (void) );
FORWARD _PROTOTYPE( char *w_name, (void) );
FORWARD _PROTOTYPE( int w_specify, (void) );
FORWARD _PROTOTYPE( int w_io_test, (void) );
FORWARD _PROTOTYPE( int w_transfer, (int proc_nr, int opcode, u64_t position,
iovec_t *iov, unsigned nr_req));
FORWARD _PROTOTYPE( int w_transfer, (endpoint_t proc_nr, int opcode,
u64_t position, iovec_t *iov, unsigned nr_req) );
FORWARD _PROTOTYPE( int com_out, (struct command *cmd) );
FORWARD _PROTOTYPE( int com_out_ext, (struct command *cmd) );
FORWARD _PROTOTYPE( void setup_dma, (unsigned *sizep, int proc_nr,
FORWARD _PROTOTYPE( void setup_dma, (unsigned *sizep, endpoint_t proc_nr,
iovec_t *iov, size_t addr_offset, int do_write,
int *do_copyoutp) );
FORWARD _PROTOTYPE( void w_need_reset, (void) );
@@ -1151,7 +1151,7 @@ PRIVATE int error_dma(struct wini *wn)
* w_transfer *
*===========================================================================*/
PRIVATE int w_transfer(proc_nr, opcode, position, iov, nr_req)
int proc_nr; /* process doing the request */
endpoint_t proc_nr; /* process doing the request */
int opcode; /* DEV_GATHER_S or DEV_SCATTER_S */
u64_t position; /* offset on device to read or write */
iovec_t *iov; /* pointer to read or write request vector */
@@ -1268,7 +1268,8 @@ unsigned nr_req; /* length of request vector */
if(proc_nr != SELF) {
s= sys_safecopyto(proc_nr, iov->iov_addr,
addr_offset,
(vir_bytes)dma_buf+dma_buf_offset, n, D);
(vir_bytes)(dma_buf+dma_buf_offset),
n, D);
if (s != OK) {
panic("w_transfer: sys_vircopy failed: %d", s);
}
@@ -1485,7 +1486,7 @@ struct command *cmd; /* Command block */
PRIVATE void setup_dma(sizep, proc_nr, iov, addr_offset, do_write,
do_copyoutp)
unsigned *sizep;
int proc_nr;
endpoint_t proc_nr;
iovec_t *iov;
size_t addr_offset;
int do_write;
@@ -2137,8 +2138,8 @@ unsigned nr_req; /* length of request vector */
} else {
dmabytes += nbytes;
while (nbytes > 0) {
size_t chunk;
chunk = nbytes;
vir_bytes chunk = nbytes;
if (chunk > iov->iov_size)
chunk = iov->iov_size;
position= add64ul(position, chunk);

3
drivers/atl2/atl2.c
View File

@@ -865,7 +865,8 @@ PRIVATE void atl2_writev(message *m, int from_int)
/* Write packet data.
*/
iovec_s_t *iovp;
size_t off, count, left, pos, size, skip;
size_t off, count, left, pos, skip;
vir_bytes size;
u8_t *sizep;
int i, j, r, batch, maxnum;

3
drivers/bios_wini/bios_wini.c
View File

@@ -188,7 +188,8 @@ unsigned nr_req; /* length of request vector */
struct wini *wn = w_wn;
iovec_t *iop, *iov_end = iov + nr_req;
int r, errors;
unsigned nbytes, count, chunk;
unsigned count;
vir_bytes chunk, nbytes;
unsigned long block;
vir_bytes i13e_rw_off, rem_buf_size;
unsigned secspcyl = wn->heads * wn->sectors;

6
drivers/dec21140A/dec21140A.c
View File

@@ -273,8 +273,7 @@ PRIVATE void do_conf(message * mp)
}
PRIVATE void do_get_name(mp)
message *mp;
PRIVATE void do_get_name(message *mp)
{
int r;
strncpy(mp->DL_NAME, progname, sizeof(mp->DL_NAME));
@@ -460,7 +459,8 @@ PRIVATE void do_vread_s(message * mp, int from_int)
{
char *buffer;
u32_t size;
int r, bytes, ix = 0;
int r, ix = 0;
vir_bytes bytes;
dpeth_t *dep = NULL;
de_loc_descr_t *descr = NULL;
iovec_dat_s_t *iovp = NULL;

2
drivers/dec21140A/dec21140A.h
View File

@@ -120,7 +120,7 @@ typedef struct dpeth {
iovec_dat_s_t de_write_iovec;
vir_bytes de_read_s;
vir_bytes de_send_s;
int de_client;
endpoint_t de_client;
} dpeth_t;

18
drivers/dp8390/dp8390.c
View File

@@ -141,9 +141,9 @@ _PROTOTYPE( static void dp_pio8_getblock, (dpeth_t *dep, int page,
_PROTOTYPE( static void dp_pio16_getblock, (dpeth_t *dep, int page,
size_t offset, size_t size, void *dst) );
_PROTOTYPE( static int dp_pkt2user, (dpeth_t *dep, int page,
int length) );
vir_bytes length) );
_PROTOTYPE( static int dp_pkt2user_s, (dpeth_t *dep, int page,
int length) );
vir_bytes length) );
_PROTOTYPE( static void dp_user2nic, (dpeth_t *dep, iovec_dat_t *iovp,
vir_bytes offset, int nic_addr, vir_bytes count) );
_PROTOTYPE( static void dp_user2nic_s, (dpeth_t *dep, iovec_dat_s_t *iovp,
@@ -792,8 +792,7 @@ message *mp;
/*===========================================================================*
* do_init *
*===========================================================================*/
static void do_init(mp)
message *mp;
static void do_init(message *mp)
{
int port;
dpeth_t *dep;
@@ -1541,9 +1540,7 @@ void *dst;
/*===========================================================================*
* dp_pkt2user *
*===========================================================================*/
static int dp_pkt2user(dep, page, length)
dpeth_t *dep;
int page, length;
static int dp_pkt2user(dpeth_t *dep, int page, vir_bytes length)
{
int last, count;
@@ -1579,9 +1576,7 @@ int page, length;
/*===========================================================================*
* dp_pkt2user_s *
*===========================================================================*/
static int dp_pkt2user_s(dep, page, length)
dpeth_t *dep;
int page, length;
static int dp_pkt2user_s(dpeth_t *dep, int page, vir_bytes length)
{
int last, count;
@@ -1625,7 +1620,8 @@ int nic_addr;
vir_bytes count;
{
vir_bytes vir_hw;
int bytes, i, r;
int i, r;
vir_bytes bytes;
vir_hw = (vir_bytes)dep->de_locmem + nic_addr;

2
drivers/dp8390/dp8390.h
View File

@@ -285,7 +285,7 @@ typedef struct dpeth
iovec_dat_t de_tmp_iovec;
iovec_dat_s_t de_tmp_iovec_s;
vir_bytes de_read_s;
int de_client;
endpoint_t de_client;
message de_sendmsg;
dp_user2nicf_t de_user2nicf;
dp_user2nicf_s_t de_user2nicf_s;

5
drivers/dpeth/devio.c
View File

@@ -53,7 +53,8 @@ PUBLIC unsigned int inw(unsigned short port)
** Name: unsigned int insb(unsigned short int port, int proc_nr, void *buffer, int count);
** Function: Reads a sequence of bytes from specified i/o port to user space buffer.
*/
PUBLIC void insb(unsigned short int port, int proc_nr, void *buffer, int count)
PUBLIC void insb(unsigned short int port, endpoint_t proc_nr,
void *buffer, int count)
{
int rc;
@@ -91,7 +92,7 @@ PUBLIC void outw(unsigned short port, unsigned long value)
** Name: void outsb(unsigned short int port, int proc_nr, void *buffer, int count);
** Function: Writes a sequence of bytes from user space to specified i/o port.
*/
PUBLIC void outsb(unsigned short port, int proc_nr, void *buffer, int count)
PUBLIC void outsb(unsigned short port, endpoint_t proc_nr, void *buffer, int count)
{
int rc;

4
drivers/dpeth/dp.h
View File

@@ -228,11 +228,11 @@ void dp_next_iovec(iovec_dat_s_t * iovp);
#else
unsigned int inb(unsigned short int);
unsigned int inw(unsigned short int);
void insb(unsigned short int, int, void *, int);
void insb(unsigned short int, endpoint_t, void *, int);
void insw(unsigned short int, int, void *, int);
void outb(unsigned short int, unsigned long);
void outw(unsigned short int, unsigned long);
void outsb(unsigned short int, int, void *, int);
void outsb(unsigned short int, endpoint_t, void *, int);
void outsw(unsigned short int, int, void *, int);
#endif