Skip to content
Snippets Groups Projects
Commit f4a5622b authored by ballen4705's avatar ballen4705
Browse files

Added Keiji as copyright holder on solaris files.

Added missing -d marvell documentation to man pages.  Leon, please check
and if necessary modify the description of what -d marvell is used for!


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1958 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent c36f199a
Branches
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Home page of code is: http://smartmontools.sourceforge.net * Home page of code is: http://smartmontools.sourceforge.net
* *
* Copyright (C) 2003-4 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
* Copyright (C) 2003-4 Casper Dik <smartmontools-support@lists.sourceforge.net> * Copyright (C) 2003-4 Casper Dik <smartmontools-support@lists.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -38,9 +39,9 @@ ...@@ -38,9 +39,9 @@
extern long long bytes; extern long long bytes;
static const char *filenameandversion="$Id: os_solaris.c,v 1.23 2004/09/14 03:34:34 ballen4705 Exp $"; static const char *filenameandversion="$Id: os_solaris.c,v 1.24 2004/09/14 14:20:38 ballen4705 Exp $";
const char *os_XXXX_c_cvsid="$Id: os_solaris.c,v 1.23 2004/09/14 03:34:34 ballen4705 Exp $" \ const char *os_XXXX_c_cvsid="$Id: os_solaris.c,v 1.24 2004/09/14 14:20:38 ballen4705 Exp $" \
ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_SOLARIS_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_SOLARIS_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
// The printwarning() function warns about unimplemented functions // The printwarning() function warns about unimplemented functions
...@@ -335,8 +336,9 @@ int ata_command_interface(int fd, smart_command_set command, int select, char *d ...@@ -335,8 +336,9 @@ int ata_command_interface(int fd, smart_command_set command, int select, char *d
data=NULL; data=NULL;
/* Above smart_* routines uses undocumented ioctls of "dada" /* Above smart_* routines uses undocumented ioctls of "dada"
* driver, which is specific to SPARC Solaris. x86 Solaris seems * driver, which is specific to SPARC Solaris. See
* not to provide similar or alternative interface... */ * os_solaris_ata.s for further details. x86 Solaris seems not to
* provide similar or alternative interface... */
if (printwarning(0)) if (printwarning(0))
return -1; return -1;
#endif #endif
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Home page of code is: http://smartmontools.sourceforge.net * Home page of code is: http://smartmontools.sourceforge.net
* *
* Copyright (C) 2003-4 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
* Copyright (C) 2003-4 Casper Dik <smartmontools-support@lists.sourceforge.net> * Copyright (C) 2003-4 Casper Dik <smartmontools-support@lists.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -38,9 +39,9 @@ ...@@ -38,9 +39,9 @@
extern long long bytes; extern long long bytes;
static const char *filenameandversion="$Id: os_solaris.cpp,v 1.23 2004/09/14 03:34:34 ballen4705 Exp $"; static const char *filenameandversion="$Id: os_solaris.cpp,v 1.24 2004/09/14 14:20:38 ballen4705 Exp $";
const char *os_XXXX_c_cvsid="$Id: os_solaris.cpp,v 1.23 2004/09/14 03:34:34 ballen4705 Exp $" \ const char *os_XXXX_c_cvsid="$Id: os_solaris.cpp,v 1.24 2004/09/14 14:20:38 ballen4705 Exp $" \
ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_SOLARIS_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_SOLARIS_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
// The printwarning() function warns about unimplemented functions // The printwarning() function warns about unimplemented functions
...@@ -335,8 +336,9 @@ int ata_command_interface(int fd, smart_command_set command, int select, char *d ...@@ -335,8 +336,9 @@ int ata_command_interface(int fd, smart_command_set command, int select, char *d
data=NULL; data=NULL;
/* Above smart_* routines uses undocumented ioctls of "dada" /* Above smart_* routines uses undocumented ioctls of "dada"
* driver, which is specific to SPARC Solaris. x86 Solaris seems * driver, which is specific to SPARC Solaris. See
* not to provide similar or alternative interface... */ * os_solaris_ata.s for further details. x86 Solaris seems not to
* provide similar or alternative interface... */
if (printwarning(0)) if (printwarning(0))
return -1; return -1;
#endif #endif
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* *
* Home page of code is: http://smartmontools.sourceforge.net * Home page of code is: http://smartmontools.sourceforge.net
* *
* Copyright (C) 2003-4 SAWADA Keiji <smartmontools-support@lists.sourceforge.net>
* Copyright (C) 2003-4 Casper Dik <smartmontools-support@lists.sourceforge.net> * Copyright (C) 2003-4 Casper Dik <smartmontools-support@lists.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -24,7 +25,7 @@ ...@@ -24,7 +25,7 @@
#ifndef OS_SOLARIS_H_ #ifndef OS_SOLARIS_H_
#define OS_SOLARIS_H_ #define OS_SOLARIS_H_
#define OS_SOLARIS_H_CVSID "$Id: os_solaris.h,v 1.9 2004/09/14 02:42:16 ballen4705 Exp $\n" #define OS_SOLARIS_H_CVSID "$Id: os_solaris.h,v 1.10 2004/09/14 14:20:38 ballen4705 Exp $\n"
// Additional material should start here. Note: to keep the '-V' CVS // Additional material should start here. Note: to keep the '-V' CVS
// reporting option working as intended, you should only #include // reporting option working as intended, you should only #include
......
.ig .ig
Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net> Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net>
$Id: smartctl.8.in,v 1.65 2004/09/14 01:48:35 ballen4705 Exp $ $Id: smartctl.8.in,v 1.66 2004/09/14 14:20:38 ballen4705 Exp $
This program is free software; you can redistribute it and/or modify it This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free under the terms of the GNU General Public License as published by the Free
...@@ -169,10 +169,13 @@ use the exit status of \fBsmartctl\fP (see RETURN VALUES below). ...@@ -169,10 +169,13 @@ use the exit status of \fBsmartctl\fP (see RETURN VALUES below).
.TP .TP
.B \-d TYPE, \-\-device=TYPE .B \-d TYPE, \-\-device=TYPE
Specifies the type of the device. The valid arguments to this option Specifies the type of the device. The valid arguments to this option
are \fIata\fP, \fIscsi\fP, and \fI3ware,N\fP. If this option is not are \fIata\fP, \fIscsi\fP, \fImarvell\fP, and \fI3ware,N\fP. If this option is not
used then \fBsmartctl\fP will attempt to guess the device type from used then \fBsmartctl\fP will attempt to guess the device type from
the device name. the device name.
Under Linux, to look at SATA disks behind Marvell chip-set controllers
(using the Marvell rather than libata driver) use \'\-d marvell\'.
To look at ATA disks behind 3ware SCSI RAID controllers, use syntax To look at ATA disks behind 3ware SCSI RAID controllers, use syntax
such as: such as:
.nf .nf
...@@ -1238,7 +1241,7 @@ these documents may be found in the References section of the ...@@ -1238,7 +1241,7 @@ these documents may be found in the References section of the
.SH .SH
CVS ID OF THIS PAGE: CVS ID OF THIS PAGE:
$Id: smartctl.8.in,v 1.65 2004/09/14 01:48:35 ballen4705 Exp $ $Id: smartctl.8.in,v 1.66 2004/09/14 14:20:38 ballen4705 Exp $
.\" Local Variables: .\" Local Variables:
.\" mode: nroff .\" mode: nroff
.\" End: .\" End:
.ig .ig
Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net> Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net>
$Id: smartd.8.in,v 1.87 2004/09/07 13:01:51 ballen4705 Exp $ $Id: smartd.8.in,v 1.88 2004/09/14 14:20:39 ballen4705 Exp $
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -566,11 +566,10 @@ directives can be used for these disks (but see note below). ...@@ -566,11 +566,10 @@ directives can be used for these disks (but see note below).
.TP .TP
.B \-d TYPE .B \-d TYPE
Specifies the type of the device. This Directive may be used multiple times Specifies the type of the device. This Directive may be used multiple
for one device, but the arguments \fIata\fP, \fIscsi\fP, and \fI3ware,N\fP are times for one device, but the arguments \fIata\fP, \fIscsi\fP,
mutually-exclusive. If more than one is given then \fImarvell\fP, and \fI3ware,N\fP are mutually-exclusive. If more than
\fBsmartd\fP one is given then \fBsmartd\fP will use the last one which appears.
will use the last one which appears.
If none of these three arguments is given, then \fBsmartd\fP will If none of these three arguments is given, then \fBsmartd\fP will
first attempt to guess the device type by looking at whether the sixth first attempt to guess the device type by looking at whether the sixth
...@@ -593,6 +592,10 @@ from issuing SCSI commands to an ATA device. ...@@ -593,6 +592,10 @@ from issuing SCSI commands to an ATA device.
\fBsmartd\fP \fBsmartd\fP
from issuing ATA commands to a SCSI device. from issuing ATA commands to a SCSI device.
.I marvell
\- Under Linux, interact with SATA disks behind Marvell chip-set
controllers (using the Marvell rather than libata driver).
.I 3ware,N .I 3ware,N
\- the device consists of one or more ATA disks connected to a 3ware \- the device consists of one or more ATA disks connected to a 3ware
RAID controller. The non-negative integer N (in the range from 0 to 15 RAID controller. The non-negative integer N (in the range from 0 to 15
...@@ -1794,4 +1797,4 @@ smartmontools home page at \fBhttp://smartmontools.sourceforge.net/\fP . ...@@ -1794,4 +1797,4 @@ smartmontools home page at \fBhttp://smartmontools.sourceforge.net/\fP .
.SH .SH
CVS ID OF THIS PAGE: CVS ID OF THIS PAGE:
$Id: smartd.8.in,v 1.87 2004/09/07 13:01:51 ballen4705 Exp $ $Id: smartd.8.in,v 1.88 2004/09/14 14:20:39 ballen4705 Exp $
.ig .ig
Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net> Copyright (C) 2002-4 Bruce Allen <smartmontools-support@lists.sourceforge.net>
$Id: smartd.conf.5.in,v 1.65 2004/09/07 13:01:51 ballen4705 Exp $ $Id: smartd.conf.5.in,v 1.66 2004/09/14 14:20:39 ballen4705 Exp $
This program is free software; you can redistribute it and/or modify it This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free under the terms of the GNU General Public License as published by the Free
...@@ -224,11 +224,10 @@ directives can be used for these disks (but see note below). ...@@ -224,11 +224,10 @@ directives can be used for these disks (but see note below).
.TP .TP
.B \-d TYPE .B \-d TYPE
Specifies the type of the device. This Directive may be used multiple times Specifies the type of the device. This Directive may be used multiple
for one device, but the arguments \fIata\fP, \fIscsi\fP, and \fI3ware,N\fP are times for one device, but the arguments \fIata\fP, \fIscsi\fP,
mutually-exclusive. If more than one is given then \fImarvell\fP, and \fI3ware,N\fP are mutually-exclusive. If more than
\fBsmartd\fP one is given then \fBsmartd\fP will use the last one which appears.
will use the last one which appears.
If none of these three arguments is given, then \fBsmartd\fP will If none of these three arguments is given, then \fBsmartd\fP will
first attempt to guess the device type by looking at whether the sixth first attempt to guess the device type by looking at whether the sixth
...@@ -251,6 +250,10 @@ from issuing SCSI commands to an ATA device. ...@@ -251,6 +250,10 @@ from issuing SCSI commands to an ATA device.
\fBsmartd\fP \fBsmartd\fP
from issuing ATA commands to a SCSI device. from issuing ATA commands to a SCSI device.
.I marvell
\- Under Linux, interact with SATA disks behind Marvell chip-set
controllers (using the Marvell rather than libata driver).
.I 3ware,N .I 3ware,N
\- the device consists of one or more ATA disks connected to a 3ware \- the device consists of one or more ATA disks connected to a 3ware
RAID controller. The non-negative integer N (in the range from 0 to 15 RAID controller. The non-negative integer N (in the range from 0 to 15
...@@ -1231,4 +1234,4 @@ SEE ALSO: ...@@ -1231,4 +1234,4 @@ SEE ALSO:
.SH .SH
CVS ID OF THIS PAGE: CVS ID OF THIS PAGE:
$Id: smartd.conf.5.in,v 1.65 2004/09/07 13:01:51 ballen4705 Exp $ $Id: smartd.conf.5.in,v 1.66 2004/09/14 14:20:39 ballen4705 Exp $
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment