Merge with /home/wd/git/u-boot/work

[oweals/u-boot.git] / include / part.h

diff --git a/include/part.h b/include/part.h
index 73000a7db2fe34eb8fa991b34726d3a6736c04d2..29c03205f2dc2950f98aa03252eb3a86e348b0f7 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -23,6 +23,7 @@
 #ifndef _PART_H
 #define _PART_H
 
+#include <ide.h>
 
 typedef struct block_dev_desc {
        int             if_type;        /* type of the interface */
@@ -35,15 +36,19 @@ typedef struct block_dev_desc {
 #ifdef CONFIG_LBA48
        unsigned char   lba48;          /* device can use 48bit addr (ATA/ATAPI v7) */
 #endif
-       unsigned long   lba;            /* number of blocks */
+       lbaint_t                lba;            /* number of blocks */
        unsigned long   blksz;          /* block size */
-       unsigned char   vendor[40];     /* IDE model, SCSI Vendor */
-       unsigned char   product[20];    /* IDE Serial no, SCSI product */
-       unsigned char   revision[8];    /* firmware revision */
+       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 */
        unsigned long   (*block_read)(int dev,
                                      unsigned long start,
-                                     unsigned long blkcnt,
-                                     unsigned long *buffer);
+                                     lbaint_t blkcnt,
+                                     void *buffer);
+       unsigned long   (*block_write)(int dev,
+                                      unsigned long start,
+                                      lbaint_t blkcnt,
+                                      const void *buffer);
 }block_dev_desc_t;
 
 /* Interface types: */
@@ -83,6 +88,14 @@ typedef struct disk_partition {
        uchar   type[32];       /* string type description              */
 } disk_partition_t;
 
+/* Misc _get_dev functions */
+block_dev_desc_t* get_dev(char* ifname, int dev);
+block_dev_desc_t* ide_get_dev(int dev);
+block_dev_desc_t* scsi_get_dev(int dev);
+block_dev_desc_t* usb_stor_get_dev(int dev);
+block_dev_desc_t* mmc_get_dev(int dev);
+block_dev_desc_t* systemace_get_dev(int dev);
+
 /* disk/part.c */
 int get_partition_info (block_dev_desc_t * dev_desc, int part, disk_partition_t *info);
 void print_part (block_dev_desc_t *dev_desc);