d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Removed unused variable.

Browse Source 
- Fixed missing argument of printf.
- Fixed printf format.
- Added parentheses suggested by the compiler.
This commit is contained in:
KATO Takenori 1999-08-10 09:13:48 +00:00
parent 8a59beb7de
commit 4562af8f9b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/pc98/pc98/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: if_ed.c,v 1.63 1999/05/10 09:06:12 kato Exp $ * $Id: if_ed.c,v 1.64 1999/07/06 19:23:18 des Exp $
*/ */
/* /*
@ -1303,7 +1303,7 @@ ed_probe_Novell_generic(sc, port, unit, flags)
*/ */
#ifdef PC98 #ifdef PC98
if (sc->type == ED_TYPE98_BDN) { if (sc->type == ED_TYPE98_BDN) {
outb(sc->asic_addr + ED_NOVELL_RESET, tmp & 0xf0 | 0x08); outb(sc->asic_addr + ED_NOVELL_RESET, (tmp & 0xf0) | 0x08);
outb(sc->nic_addr + 0x4000, tmp); outb(sc->nic_addr + 0x4000, tmp);
(void) inb(sc->asic_addr + 0x8000); (void) inb(sc->asic_addr + 0x8000);
outb(sc->asic_addr + 0x8000, tmp); outb(sc->asic_addr + 0x8000, tmp);
@ -1900,7 +1900,6 @@ static int ed_probe_SIC98(struct isa_device* pc98_dev)
struct ed_softc *sc = &ed_softc[pc98_dev->id_unit]; struct ed_softc *sc = &ed_softc[pc98_dev->id_unit];
u_char sum; u_char sum;
u_int memsize; u_int memsize;
int unit = pc98_dev->id_unit;
if ((pc98_dev->id_maddr == 0) || (pc98_dev->id_msize == 0)) if ((pc98_dev->id_maddr == 0) || (pc98_dev->id_msize == 0))
return 0; return 0;
@ -2036,7 +2035,7 @@ ed_probe_CNET98(isa_dev)
tmp_s = (tmp_s & (u_char) 0x0f); tmp_s = (tmp_s & (u_char) 0x0f);
tmp_e = tmp_s + 4; tmp_e = tmp_s + 4;
if ( (tmp_s <= tmp) && (tmp < tmp_e ) ){ if ( (tmp_s <= tmp) && (tmp < tmp_e ) ){
printf("ed%d: Please change iobase address(0x%x) or window address(0x%x) \n", printf("ed%d: Please change iobase address(0x%x) or window address(0x%lx) \n",
isa_dev->id_unit,isa_dev->id_iobase,kvtop(sc->mem_start)); isa_dev->id_unit,isa_dev->id_iobase,kvtop(sc->mem_start));
return (0); return (0);
} }
@ -2184,7 +2183,7 @@ printf("ed%d: Please change iobase address(0x%x) or window address(0x%x) \n",
break; break;
default: default:
printf("ed%d: Change Interrupt level default value from %d to %d.\n", printf("ed%d: Change Interrupt level default value from %d to %d.\n",
isa_dev->id_irq,IRQ5); isa_dev->id_unit, isa_dev->id_irq,IRQ5);
isa_dev->id_irq = IRQ5; isa_dev->id_irq = IRQ5;
outb((sc->asic_addr + ED_CNET98_INT_LEV),ED_CNET98_INT_IRQ5); outb((sc->asic_addr + ED_CNET98_INT_LEV),ED_CNET98_INT_IRQ5);
break; break;
@ -2211,7 +2210,6 @@ static int ed_probe_CNET98EL(struct isa_device* isa_dev)
static char test_pattern[32] = "THIS is A memory TEST pattern"; static char test_pattern[32] = "THIS is A memory TEST pattern";
char test_buffer[32]; char test_buffer[32];
u_short init_addr = ED_CNET98EL_INIT; u_short init_addr = ED_CNET98EL_INIT;
int unit = isa_dev->id_unit;
sc->asic_addr = isa_dev->id_iobase + ED_NOVELL_ASIC_OFFSET; sc->asic_addr = isa_dev->id_iobase + ED_NOVELL_ASIC_OFFSET;
sc->nic_addr = isa_dev->id_iobase + ED_NOVELL_NIC_OFFSET; sc->nic_addr = isa_dev->id_iobase + ED_NOVELL_NIC_OFFSET;