mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Juergen Beisert <jbe@pengutronix.de>
To: barebox@lists.infradead.org
Subject: Re: [PATCH 08/13] DISK: Add common partition handling for disk like media
Date: Mon, 21 Nov 2011 12:30:09 +0100	[thread overview]
Message-ID: <201111211230.10444.jbe@pengutronix.de> (raw)
In-Reply-To: <201111211105.30369.jbe@pengutronix.de>

Next try. Now only local vars are used.

diff --git a/common/partitions.c b/common/partitions.c
index f3e0f6f..6310988 100644
--- a/common/partitions.c
+++ b/common/partitions.c
@@ -42,14 +42,13 @@ struct partition_desc {
 	struct partition parts[8];
 };
 
-static struct partition_desc pdesc;
-
-static void add_one_partition_entry(struct partition *p)
+static void add_one_partition_entry(struct partition *p,
+						struct partition_desc *pdesc)
 {
-	if (pdesc.used_entries >= 8)
+	if (pdesc->used_entries >= 8)
 		return;	/* ignore */
-	pdesc.parts[pdesc.used_entries] = *p;
-	pdesc.used_entries++;
+	pdesc->parts[pdesc->used_entries] = *p;
+	pdesc->used_entries++;
 }
 
 /**
@@ -125,12 +124,14 @@ static int read_dos_partition_table(struct block_device *blk, uint8_t *sector_bu
 /**
  * Check if a DOS like partition describes this block device
  * @param blk Block device to register to
+ * @param pd Where to store the partition information
  * @return 0 on success, -EINVAL if no partition table was found
  *
  * It seems at least on ARM this routine canot use temp. stack space for the
  * sector. So, keep the malloc/free.
  */
-static int __maybe_unused try_dos_partition(struct block_device *blk)
+static int __maybe_unused try_dos_partition(struct block_device *blk,
+						struct partition_desc *pd)
 {
 	int part_order[4] = {0, 1, 2, 3};
 	uint8_t *buffer;
@@ -163,7 +164,7 @@ static int __maybe_unused try_dos_partition(struct block_device *blk)
 			continue;
 
 		if (pentry.first_sec != 0)
-			add_one_partition_entry(&pentry);
+			add_one_partition_entry(&pentry, pd);
 		else {
 			dev_dbg(blk->dev, "Skipping empty partition %d\n", i);
 		}
@@ -204,12 +205,13 @@ static int register_one_partition(struct block_device *blk,
  */
 int parse_partition_table(struct block_device *blk)
 {
+	struct partition_desc pdesc = { .used_entries = 0, };
 	int i;
 	int rc = 0;
 
 #ifdef CONFIG_PARTITION_DISK_DOS
 	if (pdesc.used_entries == 0)
-		try_dos_partition(blk);
+		try_dos_partition(blk, &pdesc);
 #endif
 
 	if (pdesc.used_entries != 0) {


-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

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

  reply	other threads:[~2011-11-21 11:31 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-16  9:24 Rework of handling " Juergen Beisert
2011-11-16  9:24 ` [PATCH 01/13] USB Mass Storage driver: Fix compile time warning Juergen Beisert
2011-11-16  9:24 ` [PATCH 02/13] Create a unique cdev number for on demand devices Juergen Beisert
2011-11-16  9:24 ` [PATCH 03/13] ATA/DISK: Add generic disk support when enabling the BIOS disk driver Juergen Beisert
2011-11-16  9:24 ` [PATCH 04/13] ATA/DISK: Enabling write support does not belong to 'drive types' Juergen Beisert
2011-11-16  9:24 ` [PATCH 05/13] ATA/DISK: Reorganize file structure and names for future updates Juergen Beisert
2011-11-16  9:24 ` [PATCH 06/13] ATA/DISK: The BIOS based disk driver is not an interface Juergen Beisert
2011-11-16  9:24 ` [PATCH 07/13] ATA/DISK: Share important constants and structures Juergen Beisert
2011-11-16  9:24 ` [PATCH 08/13] DISK: Add common partition handling for disk like media Juergen Beisert
2011-11-17 16:17   ` Sascha Hauer
2011-11-18  8:26     ` Juergen Beisert
2011-11-18  8:51       ` Sascha Hauer
2011-11-21 10:05     ` Juergen Beisert
2011-11-21 11:30       ` Juergen Beisert [this message]
2011-11-16  9:24 ` [PATCH 09/13] Use generic block layer to access the drives and do partition parsing Juergen Beisert
2011-11-17 17:55   ` Sascha Hauer
2011-11-16  9:24 ` [PATCH 10/13] Remove 'disk_drive.c' as it is now replaced by generic partition handling Juergen Beisert
2011-11-16  9:24 ` [PATCH 11/13] ATA/DISK: Remove the now unused header <ata.h> Juergen Beisert
2011-11-16  9:24 ` [PATCH 12/13] ATA Disk Support: Add support for native ATA type drives Juergen Beisert
2011-11-17 20:46   ` Sascha Hauer
2011-11-24 11:28     ` Juergen Beisert
2011-11-16  9:24 ` [PATCH 13/13] Add driver for IDE like interfaces Juergen Beisert
2011-11-22  8:29 [PATCHv2] Rework of handling disk like media Juergen Beisert
2011-11-22  8:29 ` [PATCH 08/13] DISK: Add common partition handling for " Juergen Beisert
2011-11-24 12:43 [PATCHv3] Rework of handling " Juergen Beisert
2011-11-24 12:43 ` [PATCH 08/13] DISK: Add common partition handling for " Juergen Beisert
2011-11-24 12:48   ` Erwin Rol

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201111211230.10444.jbe@pengutronix.de \
    --to=jbe@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox