Removed unused symbols.

Minor cleanups.
This commit is contained in:
Kees van Reeuwijk
2010-01-22 22:01:08 +00:00
parent 0cfbe936ce
commit a7cee5bec4
38 changed files with 31 additions and 102 deletions

View File

@@ -243,7 +243,7 @@ static void write_reg(int function, int index, u32_t value)
static void init_domain(int index)
{
size_t o, size, memsize;
size_t size, memsize;
phys_bytes busaddr;
size= 0x100000 / 8;
@@ -332,7 +332,7 @@ static int do_add(message *m)
static int do_add_phys(message *m)
{
int i, r;
int i;
phys_bytes start;
size_t size;
@@ -368,7 +368,6 @@ static int do_add_phys(message *m)
static int do_del_phys(message *m)
{
int r;
phys_bytes start;
size_t size;

View File

@@ -792,7 +792,7 @@ PRIVATE int w_identify()
struct wini *wn = w_wn;
struct command cmd;
int i, s;
int s;
u16_t w;
unsigned long size;
int prev_wakeup;
@@ -1191,9 +1191,9 @@ unsigned nr_req; /* length of request vector */
struct wini *wn = w_wn;
iovec_t *iop, *iov_end = iov + nr_req;
int n, r, s, errors, do_dma, do_write, do_copyout;
unsigned long v, block, w_status;
unsigned long block, w_status;
u64_t dv_size = w_dv->dv_size;
unsigned cylinder, head, sector, nbytes;
unsigned nbytes;
unsigned dma_buf_offset;
size_t addr_offset = 0;
@@ -1475,7 +1475,6 @@ struct command *cmd; /* Command block */
unsigned base_ctl = wn->base_ctl;
pvb_pair_t outbyte[11]; /* vector for sys_voutb() */
int s; /* status for sys_(v)outb() */
unsigned long w_status;
if (w_wn->state & IGNORING) return ERR;

View File

@@ -227,7 +227,6 @@ int drv_reset() {
int drv_start(int sub_dev, int DmaMode) {
u32_t enable_bit, result = 0;
u32_t debug;
/* Write default values to device in case user failed to configure.
If user did configure properly, everything is written twice.
@@ -386,7 +385,6 @@ int drv_int_sum(void) {
int drv_int(int sub_dev) {
u32_t int_status;
u32_t bit;
u32_t debug;
/* return status of interrupt bit of specified channel*/
switch (sub_dev) {

View File

@@ -116,7 +116,6 @@ PUBLIC int drv_init(void) {
PUBLIC int drv_init_hw (void) {
u16_t i, j;
u16_t chip_sel_ctrl_reg;
/* First, detect the hardware */
if (detect_hw() != OK) {
@@ -230,7 +229,6 @@ int drv_reset() {
int drv_start(int sub_dev, int DmaMode) {
u32_t enable_bit, result = 0;
u32_t debug;
/* Write default values to device in case user failed to configure.
If user did configure properly, everything is written twice.
@@ -388,7 +386,6 @@ int drv_int_sum(void) {
int drv_int(int sub_dev) {
u32_t int_status;
u32_t bit;
u32_t debug;
/* return status of interrupt bit of specified channel*/
switch (sub_dev) {

View File

@@ -87,7 +87,7 @@ PUBLIC int is_status_msg_expected = FALSE;
PUBLIC void main(void)
{
int r, caller, proc_nr, chan;
int r, caller, proc_nr;
message mess, repl_mess;
/* SEF local startup. */
@@ -311,7 +311,7 @@ PRIVATE int msg_open (int minor_dev_nr) {
PRIVATE int open_sub_dev(int sub_dev_nr, int dma_mode) {
sub_dev_t* sub_dev_ptr; int i;
sub_dev_t* sub_dev_ptr;
sub_dev_ptr = &sub_dev[sub_dev_nr];
/* Only one open at a time per sub device */
@@ -410,7 +410,6 @@ PRIVATE int close_sub_dev(int sub_dev_nr) {
PRIVATE int msg_ioctl(message *m_ptr)
{
int status, len, chan;
phys_bytes user_phys;
sub_dev_t *sub_dev_ptr;
special_file_t* special_file_ptr;
@@ -473,7 +472,7 @@ PRIVATE int msg_ioctl(message *m_ptr)
PRIVATE void msg_write(message *m_ptr)
{
int s, chan; sub_dev_t *sub_dev_ptr;
int chan; sub_dev_t *sub_dev_ptr;
special_file_t* special_file_ptr;
dprint("%s: msg_write() device %d\n", drv.DriverName, m_ptr->DEVICE);
@@ -524,7 +523,7 @@ PRIVATE void msg_write(message *m_ptr)
PRIVATE void msg_read(message *m_ptr)
{
int s, chan; sub_dev_t *sub_dev_ptr;
int chan; sub_dev_t *sub_dev_ptr;
special_file_t* special_file_ptr;
dprint("%s: msg_read() device %d\n", drv.DriverName, m_ptr->DEVICE);

View File

@@ -120,7 +120,6 @@ static void el3_reset(dpeth_t * dep)
*/
static void el3_write_fifo(dpeth_t * dep, int pktsize)
{
phys_bytes phys_user;
int bytes, ix = 0;
iovec_dat_s_t *iovp = &dep->de_write_iovec;
int r, padding = pktsize;

View File

@@ -90,7 +90,7 @@ static void mem_getblock(dpeth_t *dep, u16_t offset, int size, void *dst)
*/
static void mem_nic2user(dpeth_t * dep, int pageno, int pktsize)
{
phys_bytes offset, phys_user;
phys_bytes offset;
iovec_dat_s_t *iovp = &dep->de_read_iovec;
int bytes, ix = 0;
@@ -197,7 +197,6 @@ static void pio_getblock(dpeth_t *dep, u16_t offset, int size, void *dst)
*/
static void pio_nic2user(dpeth_t *dep, int pageno, int pktsize)
{
phys_bytes phys_user;
iovec_dat_s_t *iovp = &dep->de_read_iovec;
unsigned offset, iov_offset; int r, bytes, ix = 0;
@@ -253,7 +252,6 @@ static void pio_nic2user(dpeth_t *dep, int pageno, int pktsize)
*/
static void pio_user2nic(dpeth_t *dep, int pageno, int pktsize)
{
phys_bytes phys_user;
iovec_dat_s_t *iovp = &dep->de_write_iovec;
int r, bytes, ix = 0;
@@ -478,7 +476,7 @@ static void ns_recv(dpeth_t *dep, int fromint, int size)
static void ns_interrupt(dpeth_t * dep)
{
int isr, tsr;
int size, queue;
int queue;
while ((isr = inb_reg0(dep, DP_ISR)) != 0) {

View File

@@ -360,7 +360,6 @@ PRIVATE int e1000_init_hw(e)
e1000_t *e;
{
int r, i;
u16_t word;
e->status |= E1000_ENABLED;
e->irq_hook = e->irq;

View File

@@ -381,7 +381,6 @@ PRIVATE void f_expire_tmrs(struct driver *dp, message *m_ptr)
* timers. Possibly reschedule the next alarm.
*/
clock_t now; /* current time */
timer_t *tp;
int s;
/* Get the current time to compare the timers against. */

View File

@@ -2938,7 +2938,6 @@ PRIVATE void fxp_expire_timers()
* timers. Possibly reschedule the next alarm.
*/
clock_t now; /* current time */
timer_t *tp;
int r;
/* Get the current time to compare the timers against. */

View File

@@ -1486,14 +1486,12 @@ ether_card_t *ec;
static int lance_probe(ec)
ether_card_t *ec;
{
unsigned short pci_cmd, attached = 0;
unsigned short pci_cmd;
unsigned short ioaddr;
int lance_version, chip_version;
int devind, just_one, i, r;
u16_t vid, did;
u32_t bar;
u8_t ilr;
char *dname;
if ((ec->ec_pcibus | ec->ec_pcidev | ec->ec_pcifunc) != 0)

View File

@@ -255,8 +255,6 @@ PUBLIC void init_buffer(void)
* 'tmp_phys', the normal address is 'tmp_buf'.
*/
unsigned left;
if(!(tmp_buf = alloc_contig(2*DMA_BUF_SIZE, AC_ALIGN4K, &tmp_phys)))
panic(__FILE__, "can't allocate tmp_buf", DMA_BUF_SIZE);
}
@@ -271,7 +269,6 @@ message *mp; /* pointer to read or write message */
/* Carry out a single read or write request. */
iovec_t iovec1;
int r, opcode;
phys_bytes phys_addr;
u64_t position;
/* Disk address? Address and length of the user buffer? */
@@ -309,7 +306,7 @@ message *mp; /* pointer to read or write message */
static iovec_t iovec[NR_IOREQS];
phys_bytes iovec_size;
unsigned nr_req;
int r, j, opcode;
int r, opcode;
u64_t position;
nr_req = mp->COUNT; /* Length of I/O vector */

View File

@@ -290,7 +290,6 @@ unsigned nr_req; /* length of request vector */
unsigned long dv_size;
int accumulated_read = 0;
struct logdevice *log;
static int f;
size_t vir_offset = 0;
if(log_device < 0 || log_device >= NR_DEVS)