diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-05 15:47:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-05 15:47:39 +0100 |
| commit | e3c49aac6963901f793f8b5cb48d041d36162bcf (patch) | |
| tree | 55fbb5b8f1b62b7e3c3cbbe87b122945e7b9ae90 /include | |
| parent | a407a4ddaac41819948d16f5bbaa657974e75654 (diff) | |
| parent | f95ce0fff0775c04954ae2e4542308baaa434ac8 (diff) | |
| download | barebox-e3c49aac6963901f793f8b5cb48d041d36162bcf.tar.gz barebox-e3c49aac6963901f793f8b5cb48d041d36162bcf.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/filetype.h | 1 | ||||
| -rw-r--r-- | include/ns16550.h | 3 | ||||
| -rw-r--r-- | include/param.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/filetype.h b/include/filetype.h index eedf4b4afe..2c3c38ddd8 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -44,6 +44,7 @@ enum filetype file_detect_partition_table(const void *_buf, size_t bufsize); enum filetype file_detect_type(const void *_buf, size_t bufsize); enum filetype file_name_detect_type(const char *filename); enum filetype is_fat_or_mbr(const unsigned char *sector, unsigned long *bootsec); +int is_fat_boot_sector(const void *_buf); #define ARM_HEAD_SIZE 0x30 #define ARM_HEAD_MAGICWORD_OFFSET 0x20 diff --git a/include/ns16550.h b/include/ns16550.h index 876bb0427f..ccf950b077 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -34,9 +34,6 @@ struct NS16550_plat { /** Clock speed */ unsigned int clock; int shift; - unsigned int flags; - int mmio; -#define NS16650_FLAG_DISABLE_FIFO 1 }; #endif /* __NS16650_PLATFORM_H_ */ diff --git a/include/param.h b/include/param.h index 9856a2e552..b8dd9b1869 100644 --- a/include/param.h +++ b/include/param.h @@ -26,7 +26,7 @@ const char *dev_get_param(struct device_d *dev, const char *name); int dev_set_param(struct device_d *dev, const char *name, const char *val); struct param_d *get_param_by_name(struct device_d *dev, const char *name); -int dev_add_param(struct device_d *dev, const char *name, +struct param_d *dev_add_param(struct device_d *dev, const char *name, int (*set)(struct device_d *dev, struct param_d *p, const char *val), const char *(*get)(struct device_d *, struct param_d *p), unsigned long flags); @@ -92,7 +92,7 @@ static inline struct param_d *get_param_by_name(struct device_d *dev, return NULL; } -static inline int dev_add_param(struct device_d *dev, char *name, +static inline struct param_d *dev_add_param(struct device_d *dev, char *name, int (*set)(struct device_d *dev, struct param_d *p, const char *val), const char *(*get)(struct device_d *, struct param_d *p), unsigned long flags) |