summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-09-18 05:10:38 +0200
committerLennart Poettering <lennart@poettering.net>2009-09-18 05:10:38 +0200
commit757f63057c810d545365d455c58e5df2575b8f77 (patch)
tree122709484d80349e4c8f494bc3b897a20b23f2bf
parent6f71fbec9e4488aab2fb92cd3e0a0b2445f83237 (diff)
vala: update vala API to newest C API
-rw-r--r--atasmart.vapi72
1 files changed, 44 insertions, 28 deletions
diff --git a/atasmart.vapi b/atasmart.vapi
index b228a65..05b8c37 100644
--- a/atasmart.vapi
+++ b/atasmart.vapi
@@ -23,11 +23,14 @@
using GLib;
[CCode (cheader_filename="atasmart.h")]
-namespace Smart {
+namespace AtaSmart {
[CCode (cname="SkSmartSelfTest", cprefix="SK_SMART_SELF_TEST_")]
public enum SmartSelfTest {
- SHORT, EXTENDED, CONVEYANCE, ABORT
+ SHORT, EXTENDED, CONVEYANCE, ABORT;
+
+ [CCode (cname="sk_smart_self_test_to_string")]
+ public unowned string? to_string();
}
[Immutable]
@@ -40,20 +43,19 @@ namespace Smart {
[CCode (cname="SkSmartOfflineDataCollectionStatus", cprefix="SK_SMART_OFFLINE_DATA_COLLECTION_STATUS_")]
public enum SmartOfflineDataCollectionStatus {
- NEVER, SUCCESS, INPROGRESS, SUSPENDED, ABORTED, FATAL, UNKNOWN
- }
-
- [CCode (cname="sk_smart_offline_data_collection_status_to_string")]
- public weak string smart_offline_data_collection_status_to_string(SmartOfflineDataCollectionStatus status);
+ NEVER, SUCCESS, INPROGRESS, SUSPENDED, ABORTED, FATAL, UNKNOWN;
+ [CCode (cname="sk_smart_offline_data_collection_status_to_string")]
+ public unowned string? to_string();
+ }
[CCode (cname="SkSmartSelfTestExecutionStatus", cprefix="SK_SMART_SELF_TEST_EXECUTION_STATUS_")]
public enum SmartSelfTestExecutionStatus {
- SUCCESS_OR_NEVER, ABORTED, INTERRUPTED, FATAL, ERROR_UNKNOWN, ERROR_ELECTRICAL, ERROR_SERVO, ERROR_READ, ERROR_HANDLING, INPROGRESS
- }
+ SUCCESS_OR_NEVER, ABORTED, INTERRUPTED, FATAL, ERROR_UNKNOWN, ERROR_ELECTRICAL, ERROR_SERVO, ERROR_READ, ERROR_HANDLING, INPROGRESS;
- [CCode (cname="sk_smart_self_test_execution_status_to_string")]
- public weak string smart_self_test_execution_status_to_string(SmartSelfTestExecutionStatus status);
+ [CCode (cname="sk_smart_self_test_execution_status_to_string")]
+ public unowned string? to_string();
+ }
[Immutable]
[CCode (cname="SkSmartParsedData")]
@@ -81,11 +83,11 @@ namespace Smart {
[CCode (cname="SkSmartAttributeUnit", cprefix="SK_SMART_ATTRIBUTE_UNIT_")]
public enum SmartAttributeUnit {
- UNKNOWN, NONE, MSECONDS, SECTORS, MKELVIN
- }
+ UNKNOWN, NONE, MSECONDS, SECTORS, MKELVIN;
- [CCode (cname="sk_smart_attribute_unit_to_string")]
- public weak string smart_attribute_unit_to_string(SmartAttributeUnit unit);
+ [CCode (cname="sk_smart_attribute_unit_to_string")]
+ public unowned string? to_string();
+ }
[Immutable]
[CCode (cname="SkSmartAttributeParsedData")]
@@ -98,43 +100,57 @@ namespace Smart {
public bool threshold_valid;
public bool online;
public bool prefailure;
- public bool good;
+ public bool good_now;
+ public bool good_now_valid;
+ public bool good_in_the_past;
+ public bool good_in_the_past_valid;
+ public bool current_value_valid;
+ public bool worst_value_valid;
+ public bool warn;
public uint8 current_value;
public uint8 worst_value;
public uint64 pretty_value;
- public uint8[6] raw;
+ public uint8[] raw;
+ }
+
+ [CCode (cname="SkSmartOverall", cprefix="SK_SMART_OVERALL_")]
+ public enum SmartOverall {
+ GOOD, BAD_ATTRIBUTE_IN_THE_PAST, BAD_SECTOR, BAD_ATTRIBUTE_NOW, BAD_SECTOR_MANY, BAD_STATUS;
+
+ [CCode (cname="sk_smart_overall_to_string")]
+ public unowned string? to_string();
}
[CCode (cname="SkSmartAttributeParseCallback")]
- public delegate void SmartAttributeParseCallback(void* disk, SmartAttributeParsedData a);
+ public delegate void SmartAttributeParseCallback(Disk disk, SmartAttributeParsedData a);
[Compact]
[CCode (free_function="sk_disk_free", cname="SkDisk", cprefix="sk_disk_")]
public class Disk {
- public static int open(string name, out Disk disk);
+ public static int open(string name, out Disk? disk);
public int get_size(out uint64 bytes);
public int check_sleep_mode(out bool awake);
public int identify_is_available(out bool available);
- public int identify_parse(out weak IdentifyParsedData* data);
+ public int identify_parse(out unowned IdentifyParsedData* data);
public int smart_is_available(out bool available);
public int smart_status(out bool good);
public int smart_read_data();
+ public int smart_get_blob(out unowned void* blob, out size_t size);
+ public int smart_set_blob(void* blob, size_t size);
public int smart_parse_attributes(SmartAttributeParseCallback cb);
- public int smart_parse(out weak SmartParsedData* data);
+ public int smart_parse(out unowned SmartParsedData* data);
public int smart_self_test(SmartSelfTest test);
+ public int smart_get_power_on(out uint64 mseconds);
+ public int smart_get_power_cycle(out uint64 count);
+ public int smart_get_bad(out uint64 sectors);
+ public int smart_get_temperature(out uint64 mkelvin);
+ public int smart_get_overall(out SmartOverall overall);
public int dump();
}
-
- /* These two should move to an official vala package */
- [CCode (cname="errno", cheader_filename="errno.h")]
- public int errno;
-
- [CCode (cname="g_strerror", cheader_filename="glib.h")]
- public weak string strerror(int err);
}