oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

at_wini: resolve Coverity warnings

Browse Source
This commit is contained in:
David van Moolenbroek 2012-07-27 14:49:55 +00:00
parent d75ef5a05c
commit 0ae9652177
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/at_wini/at_wini.c
View File

@ -1500,7 +1500,6 @@ static int setup_dma(
int i, j, r; int i, j, r;
u32_t v; u32_t v;
struct wini *wn = w_wn; struct wini *wn = w_wn;
int verbose = 0;
/* First try direct scatter/gather to the supplied buffers */ /* First try direct scatter/gather to the supplied buffers */
size= *sizep; size= *sizep;
@ -1508,16 +1507,17 @@ static int setup_dma(
j= 0; /* prdt index */ j= 0; /* prdt index */
offset= 0; /* Offset in current iov */ offset= 0; /* Offset in current iov */
if(verbose) #if VERBOSE_DMA
printf("at_wini: setup_dma: proc_nr %d\n", proc_nr); printf("at_wini: setup_dma: proc_nr %d\n", proc_nr);
#endif
while (size > 0) while (size > 0)
{ {
if(verbose) { #if VERBOSE_DMA
printf( printf(
"at_wini: setup_dma: iov[%d]: addr 0x%lx, size %ld offset %d, size %d\n", "at_wini: setup_dma: iov[%d]: addr 0x%lx, size %ld offset %d, size %d\n",
i, iov[i].iov_addr, iov[i].iov_size, offset, size); i, iov[i].iov_addr, iov[i].iov_size, offset, size);
} #endif
n= iov[i].iov_size-offset; n= iov[i].iov_size-offset;
if (n > size) if (n > size)
@ -1580,14 +1580,14 @@ static int setup_dma(
panic("bad prdt index: %d", j); panic("bad prdt index: %d", j);
prdt[j-1].prdte_flags |= PRDTE_FL_EOT; prdt[j-1].prdte_flags |= PRDTE_FL_EOT;
if(verbose) { #if VERBOSE_DMA
printf("dma not bad\n"); printf("dma not bad\n");
for (i= 0; i<j; i++) { for (i= 0; i<j; i++) {
printf("prdt[%d]: base 0x%lx, size %d, flags 0x%x\n", printf("prdt[%d]: base 0x%lx, size %d, flags 0x%x\n",
i, prdt[i].prdte_base, prdt[i].prdte_count, i, prdt[i].prdte_base, prdt[i].prdte_count,
prdt[i].prdte_flags); prdt[i].prdte_flags);
} }
} #endif
/* Verify that the bus master is not active */ /* Verify that the bus master is not active */
r= sys_inb(wn->base_dma + DMA_STATUS, &v); r= sys_inb(wn->base_dma + DMA_STATUS, &v);
@ -2321,8 +2321,8 @@ static void ack_irqs(unsigned int irqs)
} }
#define STSTR(a) if (status & STATUS_ ## a) { strcat(str, #a); strcat(str, " "); } #define STSTR(a) if (status & STATUS_ ## a) strlcat(str, #a " ", sizeof(str));
#define ERRSTR(a) if (e & ERROR_ ## a) { strcat(str, #a); strcat(str, " "); } #define ERRSTR(a) if (e & ERROR_ ## a) strlcat(str, #a " ", sizeof(str));
static char *strstatus(int status) static char *strstatus(int status)
{ {
static char str[200]; static char str[200];

1
drivers/at_wini/at_wini.h
View File

@ -3,6 +3,7 @@
#include <minix/drvlib.h> #include <minix/drvlib.h>
#define VERBOSE 0 /* display identify messages during boot */ #define VERBOSE 0 /* display identify messages during boot */
#define VERBOSE_DMA 0 /* display DMA debugging information */
#define ENABLE_ATAPI 1 /* add ATAPI cd-rom support to driver */ #define ENABLE_ATAPI 1 /* add ATAPI cd-rom support to driver */
#define ATAPI_DEBUG 0 /* To debug ATAPI code. */ #define ATAPI_DEBUG 0 /* To debug ATAPI code. */