--- embedaddon/smartmontools/ataprint.h	2012/02/21 16:32:16	1.1.1.1
+++ embedaddon/smartmontools/ataprint.h	2012/10/09 09:36:45	1.1.1.2
@@ -4,7 +4,7 @@
  * Home page of code is: http://smartmontools.sourceforge.net
  *
  * Copyright (C) 2002-9 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2008-9 Christian Franke <smartmontools-support@lists.sourceforge.net>
+ * Copyright (C) 2008-12 Christian Franke <smartmontools-support@lists.sourceforge.net>
  * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 #ifndef ATAPRINT_H_
 #define ATAPRINT_H_
 
-#define ATAPRINT_H_CVSID "$Id: ataprint.h,v 1.1.1.1 2012/02/21 16:32:16 misho Exp $\n"
+#define ATAPRINT_H_CVSID "$Id: ataprint.h,v 1.1.1.2 2012/10/09 09:36:45 misho Exp $\n"
 
 #include <vector>
 
@@ -75,12 +75,15 @@ struct ata_print_options
   bool smart_auto_save_disable, smart_auto_save_enable;
 
   int smart_selftest_type; // OFFLINE_FULL_SCAN, ..., see atacmds.h. -1 for no test
+  bool smart_selftest_force; // Ignore already running test
   ata_selective_selftest_args smart_selective_args; // Extra args for selective self-test
 
   unsigned sct_temp_int;
   bool sct_temp_int_pers;
 
-  unsigned char output_format; // 0=old, 1=brief
+  enum { FMT_BRIEF = 0x01, FMT_HEX_ID = 0x02, FMT_HEX_VAL = 0x04 };
+  unsigned char output_format; // FMT_* flags
+
   unsigned char fix_firmwarebug; // FIX_*, see atacmds.h
   bool fix_swapped_id; // Fix swapped ID strings returned by some buggy drivers
 
@@ -90,6 +93,20 @@ struct ata_print_options
   bool show_presets; // Show presets and exit
   unsigned char powermode; // Skip check, if disk in idle or standby mode
 
+  bool get_set_used; // true if any get/set command is used
+  bool get_aam; // print Automatic Acoustic Management status
+  int set_aam; // disable(-1), enable(1..255->0..254) Automatic Acoustic Management
+  bool get_apm; // print Advanced Power Management status
+  int set_apm; // disable(-1), enable(2..255->1..254) Advanced Power Management
+  bool get_lookahead; // print read look-ahead status
+  int set_lookahead; // disable(-1), enable(1) read look-ahead
+  int set_standby; // set(1..255->0..254) standby timer
+  bool set_standby_now; // set drive to standby
+  bool get_security; // print ATA security status
+  bool set_security_freeze; // Freeze ATA security
+  bool get_wcache; // print write cache status
+  int set_wcache; // disable(-1), enable(1) write cache
+
   ata_print_options()
     : drive_info(false),
       smart_check_status(false),
@@ -111,14 +128,21 @@ struct ata_print_options
       smart_disable(false), smart_enable(false),
       smart_auto_offl_disable(false), smart_auto_offl_enable(false),
       smart_auto_save_disable(false), smart_auto_save_enable(false),
-      smart_selftest_type(-1),
+      smart_selftest_type(-1), smart_selftest_force(false),
       sct_temp_int(0), sct_temp_int_pers(false),
       output_format(0),
       fix_firmwarebug(FIX_NOTSPECIFIED),
       fix_swapped_id(false),
       ignore_presets(false),
       show_presets(false),
-      powermode(0)
+      powermode(0),
+      get_set_used(false),
+      get_aam(false), set_aam(0),
+      get_apm(false), set_apm(0),
+      get_lookahead(false), set_lookahead(0),
+      set_standby(0), set_standby_now(false),
+      get_security(false), set_security_freeze(false),
+      get_wcache(false), set_wcache(0)
     { }
 };