From 0cdabce076be3f59ba3e249563813749362e64d8 Mon Sep 17 00:00:00 2001 From: Nick Hibma Date: Wed, 15 Mar 2000 21:55:48 +0000 Subject: [PATCH] Various typo's. One minor nit. The speed was displayed wrong when below 1Mb/s. --- sys/cam/cam.h | 4 ++-- sys/cam/cam_ccb.h | 2 +- sys/cam/cam_periph.h | 3 ++- sys/cam/cam_xpt.c | 2 +- sys/cam/scsi/scsi_da.h | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/cam/cam.h b/sys/cam/cam.h index e20673cbc1e6..37e67fd89039 100644 --- a/sys/cam/cam.h +++ b/sys/cam/cam.h @@ -55,7 +55,7 @@ typedef u_int lun_id_t; * Definition of a CAM peripheral driver entry. Peripheral drivers instantiate * one of these for each device they wish to communicate with and pass it into * the xpt layer when they wish to schedule work on that device via the - * xpt_schecule API. + * xpt_schedule API. */ struct cam_periph; @@ -106,7 +106,7 @@ typedef enum { CAM_SEL_TIMEOUT, /* Target Selection Timeout */ CAM_CMD_TIMEOUT, /* Command timeout */ CAM_SCSI_STATUS_ERROR, /* SCSI error, look at error code in CCB */ - CAM_MSG_REJECT_REC, /* Message Reject Reveived */ + CAM_MSG_REJECT_REC, /* Message Reject Received */ CAM_SCSI_BUS_RESET, /* SCSI Bus Reset Sent/Received */ CAM_UNCOR_PARITY, /* Uncorrectable parity error occurred */ CAM_AUTOSENSE_FAIL = 0x10,/* Autosense: request sense cmd fail */ diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index a1ad90e3a5df..32245225ddb8 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -83,7 +83,7 @@ typedef enum { CAM_ENG_SGLIST = 0x00800000,/* SG list is for the HBA engine */ /* Phase cognizant mode flags */ - CAM_DIS_AUTOSRP = 0x01000000,/* Diable autosave/restore ptrs */ + CAM_DIS_AUTOSRP = 0x01000000,/* Disable autosave/restore ptrs */ CAM_DIS_AUTODISC = 0x02000000,/* Disable auto disconnect */ CAM_TGT_CCB_AVAIL = 0x04000000,/* Target CCB available */ CAM_TGT_PHASE_MODE = 0x08000000,/* The SIM runs in phase mode */ diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h index 633581f3d712..ea52c586598e 100644 --- a/sys/cam/cam_periph.h +++ b/sys/cam/cam_periph.h @@ -105,7 +105,8 @@ cam_status cam_periph_alloc(periph_ctor_t *periph_ctor, periph_oninv_t *periph_oninvalidate, periph_dtor_t *periph_dtor, periph_start_t *periph_start, - char *name, cam_periph_type type, struct cam_path *, ac_callback_t *, ac_code, void *arg); + char *name, cam_periph_type type, struct cam_path *, + ac_callback_t *, ac_code, void *arg); struct cam_periph *cam_periph_find(struct cam_path *path, char *name); int cam_periph_lock(struct cam_periph *periph, int priority); void cam_periph_unlock(struct cam_periph *periph); diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index b4da62e446f5..0da115996934 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -1465,7 +1465,7 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string) mb, speed % 1000); else printf("%s%d: %dKB/s transfers", periph->periph_name, - periph->unit_number, (speed % 1000) * 1000); + periph->unit_number, speed); if ((cts.valid & CCB_TRANS_SYNC_OFFSET_VALID) != 0 && cts.sync_offset != 0) { printf(" (%d.%03dMHz, offset %d", freq / 1000, diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h index 88a0fcd81bb9..0ac2f9e24622 100644 --- a/sys/cam/scsi/scsi_da.h +++ b/sys/cam/scsi/scsi_da.h @@ -261,7 +261,7 @@ union disk_pages /* this is the structure copied from osf */ u_int8_t pg_code; /* page code (should be 5) */ #define SMS_FLEXIBLE_GEOMETRY_PAGE 0x05 u_int8_t pg_length; /* page length (should be 0x1E) */ -#define SMS_FLEXIBLE_GEOMETRY_PLEN 0x0x1E +#define SMS_FLEXIBLE_GEOMETRY_PLEN 0x1E u_int8_t xfr_rate_1; /* transfer rate (MSB) */ u_int8_t xfr_rate_0; /* transfer rate (LSB) */ u_int8_t nheads; /* number of heads */