net: cosmetic: Clean up SNTP variables and functions

[u-boot.git] / include / dfu.h

diff --git a/include/dfu.h b/include/dfu.h
index 240916854a12a7ce8745b0ef843f6c0e4d03a325..7d31abdf337dfc3c6ae2c8e3eaa7024dd9e61e14 100644 (file)
--- a/include/dfu.h
+++ b/include/dfu.h
@@ -14,6 +14,7 @@
 #include <common.h>
 #include <linux/list.h>
 #include <mmc.h>
+#include <spi_flash.h>
 #include <linux/usb/composite.h>
 
 enum dfu_device_type {
@@ -21,6 +22,7 @@ enum dfu_device_type {
        DFU_DEV_ONENAND,
        DFU_DEV_NAND,
        DFU_DEV_RAM,
+       DFU_DEV_SF,
 };
 
 enum dfu_layout {
@@ -35,14 +37,20 @@ enum dfu_layout {
 enum dfu_op {
        DFU_OP_READ = 1,
        DFU_OP_WRITE,
+       DFU_OP_SIZE,
 };
 
 struct mmc_internal_data {
+       int dev_num;
+
        /* RAW programming */
        unsigned int lba_start;
        unsigned int lba_size;
        unsigned int lba_blk_size;
 
+       /* eMMC HW partition access */
+       int hw_partition;
+
        /* FAT/EXT */
        unsigned int dev;
        unsigned int part;
@@ -64,6 +72,14 @@ struct ram_internal_data {
        unsigned int    size;
 };
 
+struct sf_internal_data {
+       struct spi_flash *dev;
+
+       /* RAW programming */
+       u64 start;
+       u64 size;
+};
+
 #define DFU_NAME_SIZE                  32
 #define DFU_CMD_BUF_SIZE               128
 #ifndef CONFIG_SYS_DFU_DATA_BUF_SIZE
@@ -83,16 +99,19 @@ struct dfu_entity {
        char                    name[DFU_NAME_SIZE];
        int                     alt;
        void                    *dev_private;
-       int                     dev_num;
        enum dfu_device_type    dev_type;
        enum dfu_layout         layout;
+       unsigned long           max_buf_size;
 
        union {
                struct mmc_internal_data mmc;
                struct nand_internal_data nand;
                struct ram_internal_data ram;
+               struct sf_internal_data sf;
        } data;
 
+       long (*get_medium_size)(struct dfu_entity *dfu);
+
        int (*read_medium)(struct dfu_entity *dfu,
                        u64 offset, void *buf, long *len);
 
@@ -100,6 +119,9 @@ struct dfu_entity {
                        u64 offset, void *buf, long *len);
 
        int (*flush_medium)(struct dfu_entity *dfu);
+       unsigned int (*poll_timeout)(struct dfu_entity *dfu);
+
+       void (*free_entity)(struct dfu_entity *dfu);
 
        struct list_head list;
 
@@ -118,7 +140,10 @@ struct dfu_entity {
        unsigned int inited:1;
 };
 
-int dfu_config_entities(char *s, char *interface, int num);
+#ifdef CONFIG_SET_DFU_ALT_INFO
+void set_dfu_alt_info(char *interface, char *devstr);
+#endif
+int dfu_config_entities(char *s, char *interface, char *devstr);
 void dfu_free_entities(void);
 void dfu_show_entities(void);
 int dfu_get_alt_number(void);
@@ -128,20 +153,21 @@ struct dfu_entity *dfu_get_entity(int alt);
 char *dfu_extract_token(char** e, int *n);
 void dfu_trigger_reset(void);
 int dfu_get_alt(char *name);
-bool dfu_reset(void);
-int dfu_init_env_entities(char *interface, int dev);
-unsigned char *dfu_get_buf(void);
+int dfu_init_env_entities(char *interface, char *devstr);
+unsigned char *dfu_get_buf(struct dfu_entity *dfu);
 unsigned char *dfu_free_buf(void);
 unsigned long dfu_get_buf_size(void);
+bool dfu_usb_get_reset(void);
 
 int dfu_read(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
 int dfu_write(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
 int dfu_flush(struct dfu_entity *de, void *buf, int size, int blk_seq_num);
 /* Device specific */
 #ifdef CONFIG_DFU_MMC
-extern int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s);
+extern int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s);
 #else
-static inline int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
+static inline int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr,
+                                     char *s)
 {
        puts("MMC support not available!\n");
        return -1;
@@ -149,9 +175,10 @@ static inline int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s)
 #endif
 
 #ifdef CONFIG_DFU_NAND
-extern int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s);
+extern int dfu_fill_entity_nand(struct dfu_entity *dfu, char *devstr, char *s);
 #else
-static inline int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
+static inline int dfu_fill_entity_nand(struct dfu_entity *dfu, char *devstr,
+                                      char *s)
 {
        puts("NAND support not available!\n");
        return -1;
@@ -159,14 +186,26 @@ static inline int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s)
 #endif
 
 #ifdef CONFIG_DFU_RAM
-extern int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s);
+extern int dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr, char *s);
 #else
-static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s)
+static inline int dfu_fill_entity_ram(struct dfu_entity *dfu, char *devstr,
+                                     char *s)
 {
        puts("RAM support not available!\n");
        return -1;
 }
 #endif
 
+#ifdef CONFIG_DFU_SF
+extern int dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr, char *s);
+#else
+static inline int dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr,
+                                    char *s)
+{
+       puts("SF support not available!\n");
+       return -1;
+}
+#endif
+
 int dfu_add(struct usb_configuration *c);
 #endif /* __DFU_ENTITY_H_ */