[syslinux] [PATCH 05/12] core: modify disk cache to work with multidisk

[Matt Fleming]

On Mon, 2012-08-20 at 05:16 -0300, Andre Ericson wrote:
> Disk cache was modified to work with multidisk. Now fopen with
> different disks/partitions should be fully working.
> 
> Signed-off-by: Andre Ericson <de.ericson at gmail.com>
> Signed-off-by: Paulo Alcantara <pcacjr at zytor.com>
> ---
>  com32/modules/fopen_test.c | 34 +++++++++++++--------
>  core/fs/chdir.c            | 44 +--------------------------
>  core/fs/diskio.c           | 68 ++++++++++++++++++++++++++----------------
>  core/fs/fs.c               | 74 +++++++++++++++++++++++-----------------------
>  core/include/multidisk.h   |  1 -
>  core/multidisk.c           |  5 ----
>  6 files changed, 103 insertions(+), 123 deletions(-)

[...]

> diff --git a/core/include/multidisk.h b/core/include/multidisk.h
> index ccf4ad0..fc5995b 100644
> --- a/core/include/multidisk.h
> +++ b/core/include/multidisk.h
> @@ -2,7 +2,6 @@
>  #define MULTIDISK_H
>  #include "partiter.h"
>  
> -void do_magic(void *);
>  int find_partition(struct part_iter **_iter, int drive, int partition);
>  int add_fs(struct fs_info *fs, uint8_t disk, uint8_t partition);
>  struct fs_info *get_fs(uint8_t disk, uint8_t partition);
> diff --git a/core/multidisk.c b/core/multidisk.c
> index bcc24bc..78b751c 100644
> --- a/core/multidisk.c
> +++ b/core/multidisk.c
> @@ -75,11 +75,6 @@ struct fs_info *get_fs(uint8_t disk, uint8_t partition)
>      return NULL;
>  }
>  
> -void do_magic(void *buff)
> -{
> -
> -}
> -

Please merge this with the patch that introduces do_magic()

-- 
Matt Fleming, Intel Open Source Technology Center