Refreshed patches and removed patches applied upstream

[mirror_smartmontools-debian.git] / os_netbsd.cpp

diff --git a/os_netbsd.cpp b/os_netbsd.cpp
index 74f42960022c3572bf130b1293244532e9a787d2..dce2d9d5a6a6a69f70ed478e9abbc74da4feb2e4 100644 (file)
--- a/os_netbsd.cpp
+++ b/os_netbsd.cpp
@@ -11,8 +11,8 @@
  * any later version.
  *
  * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * (for example COPYING); if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
 
@@ -22,16 +22,18 @@
 #include "scsicmds.h"
 #include "utility.h"
 #include "os_netbsd.h"
+
+#include <errno.h>
 #include <unistd.h>
 
-const char *os_XXXX_c_cvsid = "$Id: os_netbsd.cpp,v 1.24 2008/03/04 22:09:47 ballen4705 Exp $" \
-ATACMDS_H_CVSID CONFIG_H_CVSID INT64_H_CVSID OS_NETBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
+const char * os_netbsd_cpp_cvsid = "$Id: os_netbsd.cpp 3806 2013-03-29 20:17:03Z chrfranke $"
+  OS_NETBSD_H_CVSID;
 
 /* global variable holding byte count of allocated memory */
 extern long long bytes;
 
 enum warnings {
-  BAD_SMART, NO_3WARE, MAX_MSG
+  BAD_SMART, NO_3WARE, NO_ARECA, MAX_MSG
 };
 
 /* Utility function for printing warnings */
@@ -167,14 +169,6 @@ deviceclose(int fd)
   return close(fd);
 }
 
-int
-marvell_command_interface(int fd, smart_command_set command, int select, char *data)
-{ return -1; }
-
-int
-highpoint_command_interface(int fd, smart_command_set command, int select, char *data)
-{ return -1; }
-
 int
 ata_command_interface(int fd, smart_command_set command, int select, char *data)
 {
@@ -343,13 +337,6 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
   return 0;
 }
 
-int
-escalade_command_interface(int fd, int disknum, int escalade_type, smart_command_set command, int select, char *data)
-{
-  printwarning(NO_3WARE, NULL);
-  return -1;
-}
-
 int
 do_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report)
 {