summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>1998-09-16 23:30:11 +0000
committerken <ken@FreeBSD.org>1998-09-16 23:30:11 +0000
commit4842598c26b53f4398c69ab1087383afd35cf4cf (patch)
tree4749f975e47669e1f67ce4aac829894cb05c6164 /sys/cam
parent0a0dbfbd489d1cdf469246e170ac645a6f29f055 (diff)
downloadFreeBSD-src-4842598c26b53f4398c69ab1087383afd35cf4cf.zip
FreeBSD-src-4842598c26b53f4398c69ab1087383afd35cf4cf.tar.gz
Some Alpha patches for CAM from Doug Rabson.
Reviewed by: gibbs Submitted by: dfr
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/cam_xpt.c4
-rw-r--r--sys/cam/scsi/scsi_da.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 3e00a65..21e019d 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cam_xpt.c,v 1.3 1998/09/16 00:11:33 ken Exp $
+ * $Id: cam_xpt.c,v 1.4 1998/09/16 13:24:37 gibbs Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@@ -1070,8 +1070,10 @@ xpt_init()
/* Install our software interrupt handlers */
/* XXX Should call some MI function to do this */
+#ifdef __i386__
ihandlers[SWI_CAMNET] = swi_camnet;
ihandlers[SWI_CAMBIO] = swi_cambio;
+#endif
}
static cam_status
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index b8ae94c..b9b1742 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: scsi_da.c,v 1.1 1998/09/15 06:36:34 gibbs Exp $
*/
#include <sys/param.h>
@@ -607,7 +607,7 @@ dadump(dev_t dev)
return (EIO);
}
- if ((unsigned)addr % (1024 * 1024) == 0) {
+ if ((intptr_t)addr % (1024 * 1024) == 0) {
#ifdef HW_WDOG
if (wdog_tickler)
(*wdog_tickler)();
OpenPOWER on IntegriCloud