diff --git a/source/lib.c b/source/lib.c index 4fe6476..b3ad343 100644 --- a/source/lib.c +++ b/source/lib.c @@ -27,17 +27,24 @@ void av_mem_size(); void device_up_time(); void device_os_version(); void device_hostname(); +void device_model(); -cpu_s _cpu; -ram_s _ram; -disk_s _disk; -device_s _device; +void init_device(); #ifdef __gnu_linux__ #include +void init_device() { + + device_s _device; + + _device.&name = device_model(); + _device.&hostname = + +} + void cpu_name(){ int buffer_size = 256; char cpu_name[buffer_size]; @@ -329,6 +336,15 @@ void device_os_version() { } +void init_device() { + + device_s _device; + + _device.name = device_model(); + _device.hostname = + +} + #endif diff --git a/source/lib.h b/source/lib.h index 26762e2..09c49b7 100644 --- a/source/lib.h +++ b/source/lib.h @@ -1,9 +1,10 @@ #ifndef LIB_H #define LIB_H +#include "types.h" #ifdef __APPLE__ -void cpu_name(); +void cpu_name(cpu_s cpu); void cpu_threads(); void cpu_temperature(); void cpu_frequency(); diff --git a/source/types.h b/source/types.h index 25566d7..dda86a5 100644 --- a/source/types.h +++ b/source/types.h @@ -21,9 +21,17 @@ typedef struct { } disk_s; typedef struct { - char* name; - char* hostname; - char* os_version; + + char *name; + char *hostname; + char *os_version; + int uptime; + cpu_s cpu; + ram_s ram; + disk_s disk; + + } device_s; + #endif