Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group

[u-boot] / include / part.h

diff --git a/include/part.h b/include/part.h
index f89ebc6e731a5029c98b40fbb3ab00df98c9d2d0..8407aa05d26b350789e16052f8b25964d65f9383 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -38,13 +38,17 @@ typedef struct block_dev_desc {
 #endif
        lbaint_t                lba;            /* number of blocks */
        unsigned long   blksz;          /* block size */
-       unsigned char   vendor [40+1];  /* IDE model, SCSI Vendor */
-       unsigned char   product[20+1];  /* IDE Serial no, SCSI product */
-       unsigned char   revision[8+1];  /* firmware revision */
+       char            vendor [40+1];  /* IDE model, SCSI Vendor */
+       char            product[20+1];  /* IDE Serial no, SCSI product */
+       char            revision[8+1];  /* firmware revision */
        unsigned long   (*block_read)(int dev,
                                      unsigned long start,
                                      lbaint_t blkcnt,
-                                     unsigned long *buffer);
+                                     void *buffer);
+       unsigned long   (*block_write)(int dev,
+                                      unsigned long start,
+                                      lbaint_t blkcnt,
+                                      const void *buffer);
 }block_dev_desc_t;
 
 /* Interface types: */
@@ -55,6 +59,7 @@ typedef struct block_dev_desc {
 #define IF_TYPE_USB            4
 #define IF_TYPE_DOC            5
 #define IF_TYPE_MMC            6
+#define IF_TYPE_SD             7
 
 /* Part types */
 #define PART_TYPE_UNKNOWN      0x00