From: Alexander Schmidt <alexs@linux.vnet.ibm.com>
To: "linux-mtd@lists.infradead.org" <linux-mtd@lists.infradead.org>
Cc: Andreas Arnez <arnez@linux.vnet.ibm.com>,
Frank Haverkamp <haver@linux.vnet.ibm.com>
Subject: Re: [PATCH 3/4 try3] ubi-utils: migrate pfiflash
Date: Tue, 2 Oct 2007 14:19:05 +0200 [thread overview]
Message-ID: <200710021419.05298.alexs@linux.vnet.ibm.com> (raw)
In-Reply-To: <200710021416.02621.alexs@linux.vnet.ibm.com>
Migrate pfiflash to the new libubi.
Signed-off-by: Alexander Schmidt <alexs@linux.vnet.ibm.com>
---
ubi-utils/Makefile | 2
ubi-utils/src/libpfiflash.c | 141 ++++++++++++++++++++++++++++++--------------
ubi-utils/src/pfiflash.c | 3
3 files changed, 102 insertions(+), 44 deletions(-)
Index: mtd-utils/ubi-utils/Makefile
===================================================================
--- mtd-utils.orig/ubi-utils/Makefile 2007-10-02 14:00:33.000000000 +0200
+++ mtd-utils/ubi-utils/Makefile 2007-10-02 14:00:42.000000000 +0200
@@ -47,7 +47,7 @@
$(CC) $(LDFLAGS) -o $@ $^
pfiflash: pfiflash.o libpfiflash.o list.o reader.o error.o libubimirror.o \
- bootenv.o hashmap.o pfi.o libubiold.o libubiold_sysfs.o crc32.o
+ bootenv.o hashmap.o pfi.o libubi.o crc32.o
$(CC) $(LDFLAGS) -o $@ $^
ubimirror: ubimirror.o error.o libubimirror.o bootenv.o hashmap.o \
Index: mtd-utils/ubi-utils/src/libpfiflash.c
===================================================================
--- mtd-utils.orig/ubi-utils/src/libpfiflash.c 2007-10-02 13:59:41.000000000 +0200
+++ mtd-utils/ubi-utils/src/libpfiflash.c 2007-10-02 14:00:42.000000000 +0200
@@ -31,12 +31,14 @@
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
+#include <unistd.h>
#define __USE_GNU
#include <string.h>
#include <stdlib.h>
+#include <limits.h>
#include <sys/ioctl.h>
-#include <libubiold.h>
+#include <libubi.h>
#include <pfiflash.h>
#include <mtd/ubi-user.h> /* FIXME Is this ok here? */
@@ -57,6 +59,9 @@
#define COMPARE_BUFFER_SIZE 2048
+#define DEFAULT_DEV_PATTERN "/dev/ubi%d"
+#define DEFAULT_VOL_PATTERN "/dev/ubi%d_%d"
+
static const char copyright [] ubi_unused =
"Copyright International Business Machines Corp., 2006, 2007";
@@ -153,7 +158,9 @@
char *err_buf, size_t err_buf_size)
{
int rc, type;
- ubi_lib_t ulib;
+ char path[PATH_MAX];
+ libubi_t ulib;
+ struct ubi_mkvol_request req;
rc = 0;
ulib = NULL;
@@ -163,8 +170,8 @@
u->ids[s], u->size, u->data_size, u->type, u->alignment,
strnlen(u->names[s], PFI_UBI_VOL_NAME_LEN), u->names[s]);
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
EBUF(PFIFLASH_ERRSTR[-rc]);
goto err;
@@ -178,8 +185,15 @@
type = UBI_DYNAMIC_VOLUME;
}
- rc = ubi_mkvol(ulib, devno, u->ids[s], type, u->size, u->alignment,
- u->names[s]);
+ snprintf(path, PATH_MAX, DEFAULT_DEV_PATTERN, devno);
+
+ req.vol_id = u->ids[s];
+ req.alignment = u->alignment;
+ req.bytes = u->size;
+ req.vol_type = type;
+ req.name = u->names[s];
+
+ rc = ubi_mkvol(ulib, path, &req);
if (rc != 0) {
rc = -PFIFLASH_ERR_UBI_MKVOL;
EBUF(PFIFLASH_ERRSTR[-rc], u->ids[s]);
@@ -188,7 +202,7 @@
err:
if (ulib != NULL)
- ubi_close(&ulib);
+ libubi_close(ulib);
return rc;
}
@@ -214,34 +228,41 @@
char *err_buf, size_t err_buf_size)
{
int rc, fd;
- ubi_lib_t ulib;
+ char path[PATH_MAX];
+ libubi_t ulib;
rc = 0;
ulib = NULL;
log_msg("[ ubirmvol id=%d", id);
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
EBUF(PFIFLASH_ERRSTR[-rc]);
goto err;
}
+ snprintf(path, PATH_MAX, DEFAULT_VOL_PATTERN, devno, id);
+
/* truncate whether it exist or not */
- fd = ubi_vol_open(ulib, devno, id, O_RDWR);
- if (fd == -1)
+ fd = open(path, O_RDWR);
+ if (fd < 0) {
+ libubi_close(ulib);
return 0; /* not existent, return 0 */
+ }
- rc = ubi_vol_update(fd, 0);
- ubi_vol_close(fd);
+ rc = ubi_update_start(ulib, fd, 0);
+ close(fd);
if (rc < 0) {
rc = -PFIFLASH_ERR_UBI_VOL_UPDATE;
EBUF(PFIFLASH_ERRSTR[-rc], id);
goto err; /* if EBUSY than empty device, continue */
}
- rc = ubi_rmvol(ulib, devno, id);
+ snprintf(path, PATH_MAX, DEFAULT_DEV_PATTERN, devno);
+
+ rc = ubi_rmvol(ulib, path, id);
if (rc != 0) {
#ifdef DEBUG
int rc_old = rc;
@@ -266,7 +287,7 @@
err:
if (ulib != NULL)
- ubi_close(&ulib);
+ libubi_close(ulib);
return rc;
}
@@ -292,20 +313,23 @@
{
int rc;
FILE* fp_in;
- ubi_lib_t ulib;
+ char path[PATH_MAX];
+ libubi_t ulib;
rc = 0;
fp_in = NULL;
ulib = NULL;
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
EBUF(PFIFLASH_ERRSTR[-rc]);
goto err;
}
- fp_in = ubi_vol_fopen_read(ulib, devno, id);
+ snprintf(path, PATH_MAX, DEFAULT_VOL_PATTERN, devno, id);
+
+ fp_in = fopen(path, "r");
if (!fp_in) {
rc = -PFIFLASH_ERR_UBI_VOL_FOPEN;
EBUF(PFIFLASH_ERRSTR[-rc], id);
@@ -326,7 +350,7 @@
if (fp_in)
fclose(fp_in);
if (ulib)
- ubi_close(&ulib);
+ libubi_close(ulib);
return rc;
}
@@ -366,12 +390,13 @@
uint32_t pfi_crc,
char *err_buf, size_t err_buf_size)
{
- int rc, warnings;
+ int rc, warnings, fd_out;
uint32_t crc;
+ char path[PATH_MAX];
size_t update_size;
FILE *fp_out;
bootenv_t bootenv_new, bootenv_res;
- ubi_lib_t ulib;
+ libubi_t ulib;
rc = 0;
warnings = 0;
@@ -393,8 +418,8 @@
* 4. Write to FILE*
*/
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
EBUF(PFIFLASH_ERRSTR[-rc]);
goto err;
@@ -443,12 +468,26 @@
goto err;
}
- fp_out = ubi_vol_fopen_update(ulib, devno, id, update_size);
+ snprintf(path, PATH_MAX, DEFAULT_VOL_PATTERN, devno, id);
+
+ fd_out = open(path, O_RDWR);
+ if (fd_out < 0) {
+ rc = -PFIFLASH_ERR_UBI_VOL_FOPEN;
+ EBUF(PFIFLASH_ERRSTR[-rc], id);
+ goto err;
+ }
+ fp_out = fdopen(fd_out, "r+");
if (!fp_out) {
rc = -PFIFLASH_ERR_UBI_VOL_FOPEN;
EBUF(PFIFLASH_ERRSTR[-rc], id);
goto err;
}
+ rc = ubi_update_start(ulib, fd_out, update_size);
+ if (rc < 0) {
+ rc = -PFIFLASH_ERR_UBI_VOL_UPDATE;
+ EBUF(PFIFLASH_ERRSTR[-rc], id);
+ goto err;
+ }
rc = bootenv_write(fp_out, bootenv_res);
if (rc != 0) {
@@ -459,7 +498,7 @@
err:
if (ulib != NULL)
- ubi_close(&ulib);
+ libubi_close(ulib);
if (bootenv_new != NULL)
bootenv_destroy(&bootenv_new);
if (bootenv_res != NULL)
@@ -496,11 +535,12 @@
uint32_t pfi_crc,
char *err_buf, size_t err_buf_size)
{
- int rc;
+ int rc, fd_out;
uint32_t crc, crc32_table[256];
+ char path[PATH_MAX];
size_t bytes_left;
FILE* fp_out;
- ubi_lib_t ulib;
+ libubi_t ulib;
rc = 0;
crc = UBI_CRC32_INIT;
@@ -511,19 +551,33 @@
log_msg("[ ubiupdatevol id=%d, update_size=%d fp_in=%p",
id, update_size, fp_in);
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
EBUF(PFIFLASH_ERRSTR[-rc]);
goto err;
}
- fp_out = ubi_vol_fopen_update(ulib, devno, id, update_size);
+ snprintf(path, PATH_MAX, DEFAULT_VOL_PATTERN, devno, id);
+
+ fd_out = open(path, O_RDWR);
+ if (fd_out < 0) {
+ rc = -PFIFLASH_ERR_UBI_VOL_FOPEN;
+ EBUF(PFIFLASH_ERRSTR[-rc], id);
+ goto err;
+ }
+ fp_out = fdopen(fd_out, "r+");
if (!fp_out) {
rc = -PFIFLASH_ERR_UBI_VOL_FOPEN;
EBUF(PFIFLASH_ERRSTR[-rc], id);
goto err;
}
+ rc = ubi_update_start(ulib, fd_out, update_size);
+ if (rc < 0) {
+ rc = -PFIFLASH_ERR_UBI_VOL_UPDATE;
+ EBUF(PFIFLASH_ERRSTR[-rc], id);
+ goto err;
+ }
init_crc32_table(crc32_table);
while (bytes_left) {
@@ -554,7 +608,7 @@
if (fp_out)
fclose(fp_out);
if (ulib)
- ubi_close(&ulib);
+ libubi_close(ulib);
return rc;
}
@@ -684,11 +738,12 @@
{
int rc, is_bootenv = 0;
unsigned int i;
- ubi_lib_t ulib = NULL;
+ char path[PATH_MAX];
+ libubi_t ulib = NULL;
FILE *fp_flash[u->ids_size];
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
goto err;
}
@@ -698,7 +753,9 @@
u->ids[i] == EXAMPLE_BOOTENV_VOL_ID_2)
is_bootenv = 1;
- fp_flash[i] = ubi_vol_fopen_read(ulib, devno, u->ids[i]);
+ snprintf(path, PATH_MAX, DEFAULT_VOL_PATTERN, devno, u->ids[i]);
+
+ fp_flash[i] = fopen(path, "r");
if (fp_flash[i] == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
goto err;
@@ -718,7 +775,7 @@
for (i = 0; i < u->ids_size; i++)
fclose(fp_flash[i]);
if (ulib)
- ubi_close(&ulib);
+ libubi_close(ulib);
return rc;
}
@@ -1070,15 +1127,15 @@
uint32_t j;
list_t ptr;
pfi_ubi_t i;
- ubi_lib_t ulib;
+ libubi_t ulib;
rc = 0;
ulib = NULL;
log_msg("[ mirror ...");
- rc = ubi_open(&ulib);
- if (rc != 0) {
+ ulib = libubi_open();
+ if (ulib == NULL) {
rc = -PFIFLASH_ERR_UBI_OPEN;
EBUF(PFIFLASH_ERRSTR[-rc]);
goto err;
@@ -1118,7 +1175,7 @@
err:
if (ulib != NULL)
- ubi_close(&ulib);
+ libubi_close(ulib);
return rc;
}
Index: mtd-utils/ubi-utils/src/pfiflash.c
===================================================================
--- mtd-utils.orig/ubi-utils/src/pfiflash.c 2007-10-02 13:59:41.000000000 +0200
+++ mtd-utils/ubi-utils/src/pfiflash.c 2007-10-02 14:00:42.000000000 +0200
@@ -27,6 +27,7 @@
* 1.3 removed argp parsing to be able to use uClib.
* 1.4 Minor cleanups.
* 1.5 Forgot to delete raw block before updating it.
+ * 1.6 Migrated to new libubi.
*/
#include <unistd.h>
@@ -43,7 +44,7 @@
#include "error.h"
#include "config.h"
-#define PROGRAM_VERSION "1.5"
+#define PROGRAM_VERSION "1.6"
static char doc[] = "\nVersion: " PROGRAM_VERSION "\n"
"pfiflash - a tool for updating a controller with PFI files.\n";
next prev parent reply other threads:[~2007-10-02 12:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-02 12:16 [PATCH 0/4 try3] ubi-utils: migrate to new libubi Alexander Schmidt
2007-10-02 12:17 ` [PATCH 1/4 try3] ubi-utils: migrate pddcustomize Alexander Schmidt
2007-10-02 12:18 ` [PATCH 2/4 try3] ubi-utils: migrate ubimirror Alexander Schmidt
2007-10-02 12:19 ` Alexander Schmidt [this message]
2007-10-02 12:19 ` [PATCH 4/4 try3] ubi-utils: remove libubiold Alexander Schmidt
2007-10-03 5:49 ` [PATCH 0/4 try3] ubi-utils: migrate to new libubi Artem Bityutskiy
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=200710021419.05298.alexs@linux.vnet.ibm.com \
--to=alexs@linux.vnet.ibm.com \
--cc=arnez@linux.vnet.ibm.com \
--cc=haver@linux.vnet.ibm.com \
--cc=linux-mtd@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.