Fixed spelling of "fictitious" in diagnostics and comments
PR: kern/6429
This commit is contained in:
parent
5b2c685f2a
commit
ade45a9294
@ -14,7 +14,7 @@
|
|||||||
*
|
*
|
||||||
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
|
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
|
||||||
*
|
*
|
||||||
* $Id: cd.c,v 1.90 1998/04/15 17:47:17 bde Exp $
|
* $Id: cd.c,v 1.91 1998/04/17 22:37:06 des Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "opt_bounce.h"
|
#include "opt_bounce.h"
|
||||||
@ -1086,7 +1086,7 @@ cd_getdisklabel(unit)
|
|||||||
* make partition 0 the whole disk
|
* make partition 0 the whole disk
|
||||||
*/
|
*/
|
||||||
strncpy(cd->disklabel.d_typename, "scsi cd_rom", 16);
|
strncpy(cd->disklabel.d_typename, "scsi cd_rom", 16);
|
||||||
strncpy(cd->disklabel.d_packname, "ficticious", 16);
|
strncpy(cd->disklabel.d_packname, "fictitious", 16);
|
||||||
cd->disklabel.d_secsize = cd->params.blksize; /* as long as it's not 0 */
|
cd->disklabel.d_secsize = cd->params.blksize; /* as long as it's not 0 */
|
||||||
cd->disklabel.d_nsectors = 100;
|
cd->disklabel.d_nsectors = 100;
|
||||||
cd->disklabel.d_ntracks = 1;
|
cd->disklabel.d_ntracks = 1;
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: od.c,v 1.36 1998/04/15 17:47:18 bde Exp $
|
* $Id: od.c,v 1.37 1998/04/17 22:37:07 des Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -97,7 +97,7 @@ struct scsi_data {
|
|||||||
#define ODINIT 0x04 /* device has been init'd */
|
#define ODINIT 0x04 /* device has been init'd */
|
||||||
struct disk_parms {
|
struct disk_parms {
|
||||||
u_char heads; /* Number of heads */
|
u_char heads; /* Number of heads */
|
||||||
u_int16_t cyls; /* Number of cylinders (ficticous) */
|
u_int16_t cyls; /* Number of cylinders (fictitious) */
|
||||||
u_int16_t sectors; /* Number of sectors/track */
|
u_int16_t sectors; /* Number of sectors/track */
|
||||||
u_int16_t secsiz; /* Number of bytes/sector */
|
u_int16_t secsiz; /* Number of bytes/sector */
|
||||||
u_int32_t disksize; /* total number sectors */
|
u_int32_t disksize; /* total number sectors */
|
||||||
@ -780,7 +780,7 @@ od_size(unit, flags)
|
|||||||
NULL,
|
NULL,
|
||||||
flags | SCSI_SILENT | SCSI_DATA_IN) != 0) {
|
flags | SCSI_SILENT | SCSI_DATA_IN) != 0) {
|
||||||
|
|
||||||
/* default to a ficticous geometry */
|
/* default to a fictitious geometry */
|
||||||
od->params.heads = 64;
|
od->params.heads = 64;
|
||||||
} else {
|
} else {
|
||||||
SC_DEBUG(sc_link, SDEV_DB3,
|
SC_DEBUG(sc_link, SDEV_DB3,
|
||||||
@ -791,7 +791,7 @@ od_size(unit, flags)
|
|||||||
|
|
||||||
od->params.heads = scsi_sense.pages.rigid_geometry.nheads;
|
od->params.heads = scsi_sense.pages.rigid_geometry.nheads;
|
||||||
if (od->params.heads == 0)
|
if (od->params.heads == 0)
|
||||||
od->params.heads = 64; /* ficticous */
|
od->params.heads = 64; /* fictitious */
|
||||||
od->params.rpm =
|
od->params.rpm =
|
||||||
scsi_2btou(&scsi_sense.pages.rigid_geometry.medium_rot_rate_1);
|
scsi_2btou(&scsi_sense.pages.rigid_geometry.medium_rot_rate_1);
|
||||||
}
|
}
|
||||||
@ -817,7 +817,7 @@ od_size(unit, flags)
|
|||||||
NULL,
|
NULL,
|
||||||
flags | SCSI_SILENT | SCSI_DATA_IN) != 0) {
|
flags | SCSI_SILENT | SCSI_DATA_IN) != 0) {
|
||||||
|
|
||||||
/* default to a ficticous geometry */
|
/* default to a fictitious geometry */
|
||||||
od->params.sectors = 32;
|
od->params.sectors = 32;
|
||||||
} else {
|
} else {
|
||||||
SC_DEBUG(sc_link, SDEV_DB3,
|
SC_DEBUG(sc_link, SDEV_DB3,
|
||||||
@ -827,7 +827,7 @@ od_size(unit, flags)
|
|||||||
od->params.sectors =
|
od->params.sectors =
|
||||||
scsi_2btou(&scsi_sense.pages.disk_format.ph_sec_t_1);
|
scsi_2btou(&scsi_sense.pages.disk_format.ph_sec_t_1);
|
||||||
if (od->params.sectors == 0)
|
if (od->params.sectors == 0)
|
||||||
od->params.sectors = 32; /* ficticous */
|
od->params.sectors = 32; /* fictitious */
|
||||||
}
|
}
|
||||||
|
|
||||||
return od->params.disksize;
|
return od->params.disksize;
|
||||||
@ -887,12 +887,12 @@ od_get_parms(unit, flags)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Use ficticious geometry, this depends on the size of medium.
|
* Use fictitious geometry, this depends on the size of medium.
|
||||||
*/
|
*/
|
||||||
sectors = od_size(unit, flags);
|
sectors = od_size(unit, flags);
|
||||||
/* od_size() sets secsiz, disksize, sectors, and heads */
|
/* od_size() sets secsiz, disksize, sectors, and heads */
|
||||||
|
|
||||||
/* ficticous number of cylinders, so that C*H*S <= total */
|
/* fictitious number of cylinders, so that C*H*S <= total */
|
||||||
if (disk_parms->sectors != 0 && disk_parms->heads != 0) {
|
if (disk_parms->sectors != 0 && disk_parms->heads != 0) {
|
||||||
disk_parms->cyls =
|
disk_parms->cyls =
|
||||||
sectors / (disk_parms->sectors * disk_parms->heads);
|
sectors / (disk_parms->sectors * disk_parms->heads);
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
*
|
*
|
||||||
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
|
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
|
||||||
*
|
*
|
||||||
* $Id: sd.c,v 1.124 1998/04/19 23:32:36 julian Exp $
|
* $Id: sd.c,v 1.125 1998/04/22 10:25:27 julian Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "opt_bounce.h"
|
#include "opt_bounce.h"
|
||||||
@ -907,9 +907,9 @@ sd_get_parms(int unit, int flags)
|
|||||||
flags | SCSI_DATA_IN) != 0) {
|
flags | SCSI_DATA_IN) != 0) {
|
||||||
|
|
||||||
printf("sd%d could not mode sense (4).", unit);
|
printf("sd%d could not mode sense (4).", unit);
|
||||||
printf(" Using ficticious geometry\n");
|
printf(" Using fictitious geometry\n");
|
||||||
/*
|
/*
|
||||||
* use adaptec standard ficticious geometry
|
* use adaptec standard fictitious geometry
|
||||||
* this depends on which controller (e.g. 1542C is
|
* this depends on which controller (e.g. 1542C is
|
||||||
* different. but we have to put SOMETHING here..)
|
* different. but we have to put SOMETHING here..)
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user