From patchwork Tue Apr 26 09:30:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marian Rotariu X-Patchwork-Id: 614890 X-Patchwork-Delegate: david.oberhollenzer@sigma-star.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qvHtr5npqz9s9Z for ; Tue, 26 Apr 2016 19:32:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1auzKo-0004LX-VJ; Tue, 26 Apr 2016 09:31:10 +0000 Received: from relay1.mentorg.com ([192.94.38.131]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1auzKf-0003YO-JU for linux-mtd@lists.infradead.org; Tue, 26 Apr 2016 09:31:02 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1auzKN-0000ro-P1 from Marian_Rotariu@mentor.com for linux-mtd@lists.infradead.org; Tue, 26 Apr 2016 02:30:43 -0700 Received: from mrotariu-Precision-M4800.world.mentorg.com (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Tue, 26 Apr 2016 10:30:42 +0100 From: Marian Rotariu To: Subject: [PATCH 3/4] mtd-utils: fetch erasereg in legacy library Date: Tue, 26 Apr 2016 12:30:23 +0300 Message-ID: <1461663024-12022-4-git-send-email-marian_rotariu@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461663024-12022-1-git-send-email-marian_rotariu@mentor.com> References: <1461663024-12022-1-git-send-email-marian_rotariu@mentor.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160426_023101_695025_5A1C039B X-CRM114-Status: GOOD ( 10.80 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [192.94.38.131 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marian Rotariu Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Marian Rotariu --- lib/libmtd_legacy.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/lib/libmtd_legacy.c b/lib/libmtd_legacy.c index 233a92e..5f2db9c 100644 --- a/lib/libmtd_legacy.c +++ b/lib/libmtd_legacy.c @@ -233,7 +233,7 @@ int legacy_get_dev_info(const char *node, struct mtd_dev_info *mtd) { struct stat st; struct mtd_info_user ui; - int fd, ret; + int fd, ret, region_cnt, i; loff_t offs = 0; struct proc_parse_info pi; @@ -282,6 +282,32 @@ int legacy_get_dev_info(const char *node, struct mtd_dev_info *mtd) } else mtd->bb_allowed = 1; + ret = ioctl(fd, MEMGETREGIONCOUNT, ®ion_cnt); + if (ret == -1) { + if (errno != EOPNOTSUPP) { + sys_errmsg("MEMGETREGIONCOUNT ioctl failed"); + goto out_close; + } + errno = 0; + mtd->region_cnt = 0; + } else + mtd->region_cnt = region_cnt; + + if (mtd->region_cnt) { + mtd->reginfo = calloc(mtd->region_cnt, + sizeof(struct region_info_user)); + if (!mtd->reginfo) { + errno = ENOMEM; + goto out_close; + } + + for (i = 0; i < mtd->region_cnt; i++) { + ret = mtd_regioninfo(fd, i, &(mtd->reginfo[i])); + if (ret) + goto out_close; + } + } + mtd->type = ui.type; mtd->size = ui.size; mtd->eb_size = ui.erasesize;