From 50d91a93def6516a68eeb4b74c7344a29026b136 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Wed, 8 Mar 2006 00:14:28 -0800 Subject: [PATCH] --- yaml --- r: 22605 b: refs/heads/master c: ad0e1d9f0155073cffb74755fb21c0fb82b1b094 h: refs/heads/master i: 22603: 1300d19406a8679e20a25e80680b56f97e28f4ae v: v3 --- [refs] | 2 +- trunk/drivers/scsi/FlashPoint.c | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 3c238c784b78..35cbed0963d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd1e29ed62cc307281d1a62f73ebac059ac6b6a1 +refs/heads/master: ad0e1d9f0155073cffb74755fb21c0fb82b1b094 diff --git a/trunk/drivers/scsi/FlashPoint.c b/trunk/drivers/scsi/FlashPoint.c index 6089af003130..022a4c0da7e1 100644 --- a/trunk/drivers/scsi/FlashPoint.c +++ b/trunk/drivers/scsi/FlashPoint.c @@ -44,13 +44,7 @@ -#define s08bits char -#define s16bits short -#define s32bits long -#define u08bits unsigned s08bits -#define u16bits unsigned s16bits -#define u32bits unsigned s32bits @@ -245,12 +239,12 @@ typedef struct _SCCB { #define SG_ELEMENT_SIZE 8 /*Eight byte per element. */ -#define RD_HARPOON(ioport) inb((u32bits)ioport) -#define RDW_HARPOON(ioport) inw((u32bits)ioport) -#define RD_HARP32(ioport,offset,data) (data = inl((u32bits)(ioport + offset))) -#define WR_HARPOON(ioport,val) outb((u08bits) val, (u32bits)ioport) -#define WRW_HARPOON(ioport,val) outw((u16bits)val, (u32bits)ioport) -#define WR_HARP32(ioport,offset,data) outl(data, (u32bits)(ioport + offset)) +#define RD_HARPOON(ioport) inb((u32)ioport) +#define RDW_HARPOON(ioport) inw((u32)ioport) +#define RD_HARP32(ioport,offset,data) (data = inl((u32)(ioport + offset))) +#define WR_HARPOON(ioport,val) outb((u8) val, (u32)ioport) +#define WRW_HARPOON(ioport,val) outw((u16)val, (u32)ioport) +#define WR_HARP32(ioport,offset,data) outl(data, (u32)(ioport + offset)) #define TAR_SYNC_MASK (BIT(7)+BIT(6))