git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
oktagon_esp.c
diff --git
a/drivers/scsi/oktagon_esp.c
b/drivers/scsi/oktagon_esp.c
index
10c63ad
..
c116a6a
100644
(file)
--- a/
drivers/scsi/oktagon_esp.c
+++ b/
drivers/scsi/oktagon_esp.c
@@
-6,7
+6,6
@@
* Based on cyber_esp.c
*/
* Based on cyber_esp.c
*/
-#include <linux/config.h>
#if defined(CONFIG_AMIGA) || defined(CONFIG_APUS)
#define USE_BOTTOM_HALF
#if defined(CONFIG_AMIGA) || defined(CONFIG_APUS)
#define USE_BOTTOM_HALF
@@
-29,7
+28,7
@@
#include "scsi.h"
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include "NCR53C9x.h"
#include <linux/zorro.h>
#include "NCR53C9x.h"
#include <linux/zorro.h>
@@
-72,15
+71,13
@@
static void dma_mmu_release_scsi_sgl(struct NCR_ESP *,Scsi_Cmnd *);
static void dma_advance_sg(Scsi_Cmnd *);
static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x);
static void dma_advance_sg(Scsi_Cmnd *);
static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x);
-void esp_bootup_reset(struct NCR_ESP *esp,struct ESP_regs *eregs);
-
#ifdef USE_BOTTOM_HALF
#ifdef USE_BOTTOM_HALF
-static void dma_commit(
void *opaque
);
+static void dma_commit(
struct work_struct *unused
);
long oktag_to_io(long *paddr, long *addr, long len);
long oktag_from_io(long *addr, long *paddr, long len);
long oktag_to_io(long *paddr, long *addr, long len);
long oktag_from_io(long *addr, long *paddr, long len);
-static DECLARE_WORK(tq_fake_dma, dma_commit
, NULL
);
+static DECLARE_WORK(tq_fake_dma, dma_commit);
#define DMA_MAXTRANSFER 0x8000
#define DMA_MAXTRANSFER 0x8000
@@
-116,7
+113,7
@@
static volatile unsigned char cmd_buffer[16];
*/
/***************************************************************** Detection */
*/
/***************************************************************** Detection */
-int oktagon_esp_detect(
Scsi_Host_T
emplate *tpnt)
+int oktagon_esp_detect(
struct scsi_host_t
emplate *tpnt)
{
struct NCR_ESP *esp;
struct zorro_dev *z = NULL;
{
struct NCR_ESP *esp;
struct zorro_dev *z = NULL;
@@
-200,7
+197,7
@@
int oktagon_esp_detect(Scsi_Host_Template *tpnt)
esp->esp_command_dvma = (__u32) cmd_buffer;
esp->irq = IRQ_AMIGA_PORTS;
esp->esp_command_dvma = (__u32) cmd_buffer;
esp->irq = IRQ_AMIGA_PORTS;
- request_irq(IRQ_AMIGA_PORTS, esp_intr,
SA_SHIRQ
,
+ request_irq(IRQ_AMIGA_PORTS, esp_intr,
IRQF_SHARED
,
"BSC Oktagon SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */
"BSC Oktagon SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */
@@
-269,7
+266,7
@@
oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x)
*/
*/
-static void dma_commit(
void *opaque
)
+static void dma_commit(
struct work_struct *unused
)
{
long wait,len2,pos;
struct NCR_ESP *esp;
{
long wait,len2,pos;
struct NCR_ESP *esp;
@@
-492,7
+489,7
@@
static void dma_led_on(struct NCR_ESP *esp)
static int dma_ports_p(struct NCR_ESP *esp)
{
static int dma_ports_p(struct NCR_ESP *esp)
{
- return ((custom.intenar) & IF_PORTS);
+ return ((
amiga_
custom.intenar) & IF_PORTS);
}
static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
}
static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
@@
-587,7
+584,7
@@
int oktagon_esp_release(struct Scsi_Host *instance)
}
}
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "esp-oktagon",
.proc_info = &esp_proc_info,
.name = "BSC Oktagon SCSI",
.proc_name = "esp-oktagon",
.proc_info = &esp_proc_info,
.name = "BSC Oktagon SCSI",