ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/scsi_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/scsi_amiga.cpp (file contents):
Revision 1.4 by cebix, 2001-05-24T14:31:07Z vs.
Revision 1.7 by jlachmann, 2002-06-23T08:27:05Z

# Line 22 | Line 22
22   #include <exec/memory.h>
23   #include <devices/trackdisk.h>
24   #include <devices/scsidisk.h>
25 + #define __USE_SYSBASE
26   #include <proto/exec.h>
27 + #include <inline/exec.h>
28  
29   #include "sysdeps.h"
30   #include "main.h"
# Line 78 | Line 80 | void SCSIInit(void)
80          buffer = (UBYTE *)AllocMem(buffer_size = 0x10000, buffer_memf);
81          sense_buffer = (UBYTE *)AllocMem(SENSE_LENGTH, MEMF_CHIP | MEMF_PUBLIC);
82          if (the_port == NULL || buffer == NULL || sense_buffer == NULL) {
83 <                ErrorAlert(GetString(STR_NO_MEM_ERR));
83 >                ErrorAlert(STR_NO_MEM_ERR);
84                  QuitEmulator();
85          }
86  
# Line 97 | Line 99 | void SCSIInit(void)
99                                          struct IOStdReq *io = (struct IOStdReq *)CreateIORequest(the_port, sizeof(struct IOStdReq));
100                                          if (io == NULL)
101                                                  continue;
102 <                                        if (OpenDevice((UBYTE *)dev_name, dev_unit + lun * 10, (struct IORequest *)io, 0)) {
102 >                                        if (OpenDevice((UBYTE *) dev_name, dev_unit + lun * 10, (struct IORequest *)io, 0)) {
103                                                  DeleteIORequest(io);
104                                                  continue;
105                                          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines