diff --git a/include/driver.h b/include/driver.h index d4133cf97..b773839cd 100644 --- a/include/driver.h +++ b/include/driver.h @@ -1,42 +1,19 @@ #ifndef DRIVER_H #define DRIVER_H -#include - #define MAX_DRIVER_NAME 16 #define MAP_READ 1 #define MAP_WRITE 2 -#define PARAM_TYPE_STRING 1 -#define PARAM_TYPE_ULONG 2 -#define PARAM_TYPE_IPADDR 3 - -#define PARAM_FLAG_RO (1 << 0) - -typedef union { - char *val_str; - ulong val_ulong; - IPaddr_t val_ip; -} value_t; - -struct param_d { - struct param_d* (*get)(struct device_d *, struct param_d *param); - int (*set)(struct device_d *, struct param_d *param, value_t val); - ulong type; - ulong flags; - char *name; - ulong cookie; - struct param_d *next; - value_t value; -}; - #define DEVICE_TYPE_UNKNOWN 0 #define DEVICE_TYPE_ETHER 1 #define DEVICE_TYPE_STDIO 2 #define DEVICE_TYPE_DRAM 3 #define MAX_DEVICE_TYPE 3 +#include + struct device_d { char name[MAX_DRIVER_NAME]; char id[MAX_DRIVER_NAME]; @@ -95,24 +72,11 @@ struct device_d *get_device_by_type(ulong type, struct device_d *last); ssize_t read(struct device_d *dev, void *buf, size_t count, ulong offset, ulong flags); ssize_t write(struct device_d *dev, void *buf, size_t count, ulong offset, ulong flags); ssize_t erase(struct device_d *dev, size_t count, unsigned long offset); -struct param_d* dev_get_param(struct device_d *dev, char *name); -int dev_set_param(struct device_d *dev, char *name, value_t val); -struct param_d *get_param_by_name(struct device_d *dev, char *name); -void print_param(struct param_d *param); -IPaddr_t dev_get_param_ip(struct device_d *dev, char *name); -int dev_set_param_ip(struct device_d *dev, char *name, IPaddr_t ip); - -int dev_add_parameter(struct device_d *dev, struct param_d *par); ssize_t mem_read(struct device_d *dev, void *buf, size_t count, ulong offset, ulong flags); ssize_t mem_write(struct device_d *dev, void *buf, size_t count, ulong offset, ulong flags); -int register_device_type_handler(int(*handle)(struct device_d *), ulong device_type); -//void unregister_device_type_handler(struct device_d *); - int dummy_probe(struct device_d *); -int global_add_parameter(struct param_d *param); - #endif /* DRIVER_H */