[PATCH 2/2 v2] common/partitions.c: make use of is_fat_or_mbr

[PATCH 2/2 v2] common/partitions.c: make use of is_fat_or_mbr

[Franck Jullien]

Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
---
 common/partitions.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/common/partitions.c b/common/partitions.c
index 0e42937..24310a3 100644
--- a/common/partitions.c
+++ b/common/partitions.c
@@ -28,6 +28,7 @@
 #include <asm/unaligned.h>
 #include <disks.h>
 #include <dma.h>
+#include <filetype.h>
 
 struct partition {
 	uint64_t first_sec;
@@ -85,7 +86,7 @@ static void __maybe_unused try_dos_partition(struct block_device *blk,
 		goto on_error;
 	}
 
-	if ((buffer[510] != 0x55) || (buffer[511] != 0xAA)) {
+	if (is_fat_or_mbr(buffer, NULL) != filetype_mbr) {
 		dev_info(blk->dev, "No partition table found\n");
 		goto on_error;
 	}
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/2 v2] common/partitions.c: make use of is_fat_or_mbr

[Sascha Hauer]

On Thu, Oct 11, 2012 at 10:45:21PM +0200, Franck Jullien wrote:
> Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
> ---
>  common/partitions.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/common/partitions.c b/common/partitions.c
> index 0e42937..24310a3 100644
> --- a/common/partitions.c
> +++ b/common/partitions.c
> @@ -28,6 +28,7 @@
>  #include <asm/unaligned.h>
>  #include <disks.h>
>  #include <dma.h>
> +#include <filetype.h>
>  
>  struct partition {
>  	uint64_t first_sec;
> @@ -85,7 +86,7 @@ static void __maybe_unused try_dos_partition(struct block_device *blk,
>  		goto on_error;
>  	}
>  
> -	if ((buffer[510] != 0x55) || (buffer[511] != 0xAA)) {
> +	if (is_fat_or_mbr(buffer, NULL) != filetype_mbr) {
>  		dev_info(blk->dev, "No partition table found\n");
>  		goto on_error;
>  	}
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox