From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932338AbWAKClA (ORCPT ); Tue, 10 Jan 2006 21:41:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932648AbWAKClA (ORCPT ); Tue, 10 Jan 2006 21:41:00 -0500 Received: from mail.deathmatch.net ([216.200.85.210]:29846 "EHLO mail.deathmatch.net") by vger.kernel.org with ESMTP id S932338AbWAKCk7 (ORCPT ); Tue, 10 Jan 2006 21:40:59 -0500 Date: Tue, 10 Jan 2006 21:40:40 -0500 From: Bob Copeland To: linux-kernel@vger.kernel.org, aeb@cwi.nl Subject: [PATCH] partitions: Read Rio Karma partition table Message-ID: <20060111024040.GA26916@hash.localnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The Rio Karma portable MP3 player has its own proprietary partition table. The partition layout is similar to a DOS boot sector but it begins at a different offset and uses a different magic number (0xAB56 instead of 0xAA55). Add support for it to enable mounting the device. Signed-off-by: Bob Copeland --- This is a companion patch to a pending one to add USB storage support. Last posting on LKML received no comments. Andries, I'm copying you as a shot in the dark as the closest I can find in the MAINTAINERS. Several people over on linux-karma.sf.net are using the patch without problems. fs/partitions/Kconfig | 7 ++++++ fs/partitions/Makefile | 1 + fs/partitions/check.c | 4 +++ fs/partitions/karma.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ fs/partitions/karma.h | 8 +++++++ 5 files changed, 77 insertions(+), 0 deletions(-) create mode 100644 fs/partitions/karma.c create mode 100644 fs/partitions/karma.h applies-to: d83fa1699e8113d83588d38a1c16e68cd3fcf462 40277840eeeea47e549466da9d92774885367959 diff --git a/fs/partitions/Kconfig b/fs/partitions/Kconfig index 656bc43..cb710fd 100644 --- a/fs/partitions/Kconfig +++ b/fs/partitions/Kconfig @@ -225,4 +225,11 @@ config EFI_PARTITION were partitioned using EFI GPT. Presently only useful on the IA-64 platform. +config KARMA_PARTITION + bool "Karma Partition support" + depends on PARTITION_ADVANCED + help + Say Y here if you would like to mount the Rio Karma MP3 player, + as it uses a proprietary partition table. + # define_bool CONFIG_ACORN_PARTITION_CUMANA y diff --git a/fs/partitions/Makefile b/fs/partitions/Makefile index 66d5cc2..42c7d38 100644 --- a/fs/partitions/Makefile +++ b/fs/partitions/Makefile @@ -17,3 +17,4 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o obj-$(CONFIG_IBM_PARTITION) += ibm.o obj-$(CONFIG_EFI_PARTITION) += efi.o +obj-$(CONFIG_KARMA_PARTITION) += karma.o diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 7881ce0..f924f45 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -35,6 +35,7 @@ #include "ibm.h" #include "ultrix.h" #include "efi.h" +#include "karma.h" #ifdef CONFIG_BLK_DEV_MD extern void md_autodetect_dev(dev_t dev); @@ -103,6 +104,9 @@ static int (*check_part[])(struct parsed #ifdef CONFIG_IBM_PARTITION ibm_partition, #endif +#ifdef CONFIG_KARMA_PARTITION + karma_partition, +#endif NULL }; diff --git a/fs/partitions/karma.c b/fs/partitions/karma.c new file mode 100644 index 0000000..bb1b881 --- /dev/null +++ b/fs/partitions/karma.c @@ -0,0 +1,57 @@ +/* + * fs/partitions/karma.c + * Rio Karma partition info. + * + * Copyright (C) 2006 Bob Copeland (me@bobcopeland.com) + * based on osf.c + */ + +#include "check.h" +#include "karma.h" + +int karma_partition(struct parsed_partitions *state, struct block_device *bdev) +{ + int i; + int slot = 1; + Sector sect; + unsigned char *data; + struct disklabel { + u8 d_reserved[270]; + struct d_partition { + __le32 p_res; + u8 p_fstype; + u8 p_res2[3]; + __le32 p_offset; + __le32 p_size; + } d_partitions[2]; + u8 d_blank[208]; + __le16 d_magic; + } __attribute__((packed)) *label; + struct d_partition *p; + + data = read_dev_sector(bdev, 0, §); + if (!data) + return -1; + + label = (struct disklabel *) data; + if (le16_to_cpu(label->d_magic) != KARMA_LABEL_MAGIC) { + put_dev_sector(sect); + return 0; + } + + p = label->d_partitions; + for (i = 0 ; i < 2; i++, p++) { + if (slot == state->limit) + break; + + if (p->p_fstype == 0x4d && le32_to_cpu(p->p_size)) { + put_partition(state, slot, le32_to_cpu(p->p_offset), + le32_to_cpu(p->p_size)); + } + slot++; + } + printk("\n"); + put_dev_sector(sect); + return 1; +} + diff --git a/fs/partitions/karma.h b/fs/partitions/karma.h new file mode 100644 index 0000000..ecf7d3f --- /dev/null +++ b/fs/partitions/karma.h @@ -0,0 +1,8 @@ +/* + * fs/partitions/karma.h + */ + +#define KARMA_LABEL_MAGIC 0xAB56 + +int karma_partition(struct parsed_partitions *state, struct block_device *bdev); + --- 0.99.9i -- Bob Copeland %% www.bobcopeland.com