Skip to content
Snippets Groups Projects
Commit c3e0c0cf authored by snyderx's avatar snyderx
Browse files

os_openbsd.c: Replaced WDSM_* cmds with the atacmds.h ATA_SMART_* cmds. 

os_openbsd.h: Removed WDSM_* cmds (cmds unnecessary).


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1942 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent b9de18c7
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sm5/os_openbsd.c
+ 6
− 6
View file @ c3e0c0cf
......@@ -24,7 +24,7 @@
#include "utility.h"
#include "os_openbsd.h"
const char *os_XXXX_c_cvsid = "$Id: os_openbsd.c,v 1.4 2004/08/30 22:51:17 shattered Exp $" \
const char *os_XXXX_c_cvsid = "$Id: os_openbsd.c,v 1.5 2004/09/09 04:39:51 snyderx Exp $" \
ATACMDS_H_CVSID OS_OPENBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
/* global variable holding byte count of allocated memory */
......@@ -184,7 +184,7 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
switch (command) {
case READ_VALUES:
req.flags = ATACMD_READ;
req.features = WDSM_RD_DATA;
req.features = ATA_SMART_READ_VALUES;
req.command = ATAPI_SMART;
req.databuf = (caddr_t) inbuf;
req.datalen = sizeof(inbuf);
......@@ -194,7 +194,7 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
break;
case READ_THRESHOLDS:
req.flags = ATACMD_READ;
req.features = WDSM_RD_THRESHOLDS;
req.features = ATA_SMART_READ_THRESHOLDS;
req.command = ATAPI_SMART;
req.databuf = (caddr_t) inbuf;
req.datalen = sizeof(inbuf);
......@@ -244,14 +244,14 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
break;
case ENABLE:
req.flags = ATACMD_READ;
req.features = WDSM_ENABLE_OPS;
req.features = ATA_SMART_ENABLE;
req.command = ATAPI_SMART;
req.cylinder = htole16(WDSMART_CYL);
req.timeout = 1000;
break;
case DISABLE:
req.flags = ATACMD_READ;
req.features = WDSM_DISABLE_OPS;
req.features = ATA_SMART_DISABLE;
req.command = ATAPI_SMART;
req.cylinder = htole16(WDSMART_CYL);
req.timeout = 1000;
......@@ -293,7 +293,7 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
/* same command, no HDIO in NetBSD */
case STATUS:
req.flags = ATACMD_READ;
req.features = WDSM_STATUS;
req.features = ATA_SMART_STATUS;
req.command = ATAPI_SMART;
req.cylinder = htole16(WDSMART_CYL);
req.timeout = 1000;
......
sm5/os_openbsd.cpp
+ 6
− 6
View file @ c3e0c0cf
......@@ -24,7 +24,7 @@
#include "utility.h"
#include "os_openbsd.h"
const char *os_XXXX_c_cvsid = "$Id: os_openbsd.cpp,v 1.4 2004/08/30 22:51:17 shattered Exp $" \
const char *os_XXXX_c_cvsid = "$Id: os_openbsd.cpp,v 1.5 2004/09/09 04:39:51 snyderx Exp $" \
ATACMDS_H_CVSID OS_OPENBSD_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
/* global variable holding byte count of allocated memory */
......@@ -184,7 +184,7 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
switch (command) {
case READ_VALUES:
req.flags = ATACMD_READ;
req.features = WDSM_RD_DATA;
req.features = ATA_SMART_READ_VALUES;
req.command = ATAPI_SMART;
req.databuf = (caddr_t) inbuf;
req.datalen = sizeof(inbuf);
......@@ -194,7 +194,7 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
break;
case READ_THRESHOLDS:
req.flags = ATACMD_READ;
req.features = WDSM_RD_THRESHOLDS;
req.features = ATA_SMART_READ_THRESHOLDS;
req.command = ATAPI_SMART;
req.databuf = (caddr_t) inbuf;
req.datalen = sizeof(inbuf);
......@@ -244,14 +244,14 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
break;
case ENABLE:
req.flags = ATACMD_READ;
req.features = WDSM_ENABLE_OPS;
req.features = ATA_SMART_ENABLE;
req.command = ATAPI_SMART;
req.cylinder = htole16(WDSMART_CYL);
req.timeout = 1000;
break;
case DISABLE:
req.flags = ATACMD_READ;
req.features = WDSM_DISABLE_OPS;
req.features = ATA_SMART_DISABLE;
req.command = ATAPI_SMART;
req.cylinder = htole16(WDSMART_CYL);
req.timeout = 1000;
......@@ -293,7 +293,7 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
/* same command, no HDIO in NetBSD */
case STATUS:
req.flags = ATACMD_READ;
req.features = WDSM_STATUS;
req.features = ATA_SMART_STATUS;
req.command = ATAPI_SMART;
req.cylinder = htole16(WDSMART_CYL);
req.timeout = 1000;
......
sm5/os_openbsd.h
+ 1
− 11
View file @ c3e0c0cf
......@@ -26,21 +26,11 @@
#ifndef OS_OPENBSD_H_
#define OS_OPENBSD_H_
#define OS_OPENBSD_H_CVSID "$Id: os_openbsd.h,v 1.1 2004/08/29 07:10:44 snyderx Exp $\n"
#define OS_OPENBSD_H_CVSID "$Id: os_openbsd.h,v 1.2 2004/09/09 04:39:51 snyderx Exp $\n"
/* from NetBSD: atareg.h,v 1.17, by Manuel Bouyer */
/* Actually fits _perfectly_ into OBSDs wdcreg.h, but... */
/* Subcommands for SMART (features register) */
#define WDSM_RD_DATA 0xd0
#define WDSM_RD_THRESHOLDS 0xd1
#define WDSM_ATTR_AUTOSAVE_EN 0xd2
#define WDSM_SAVE_ATTR 0xd3
#define WDSM_EXEC_OFFL_IMM 0xd4
#define WDSM_RD_LOG 0xd5
#define WDSM_ENABLE_OPS 0xd8
#define WDSM_DISABLE_OPS 0xd9
#define WDSM_STATUS 0xda
#define WDSMART_CYL 0xc24f
#include <sys/device.h>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

AEI Privacy Policy Imprint