mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 06:08:59 +03:00
[package] unvram: make it work on bcm47xx, also look for /dev/mtdblockX
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15429 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9f70f9f3b9
commit
d7b9dc5572
@ -8,7 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=unvram
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
|
||||
|
||||
|
@ -409,6 +409,7 @@ const char * nvram_find_mtd(void)
|
||||
int i, esz;
|
||||
char dev[PATH_MAX];
|
||||
char *path = NULL;
|
||||
struct stat s;
|
||||
|
||||
// "/dev/mtdblock/" + ( 0 < x < 99 ) + \0 = 19
|
||||
if( (path = (char *) malloc(19)) == NULL )
|
||||
@ -416,12 +417,30 @@ const char * nvram_find_mtd(void)
|
||||
|
||||
if ((fp = fopen("/proc/mtd", "r"))) {
|
||||
while (fgets(dev, sizeof(dev), fp)) {
|
||||
if (strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz)) {
|
||||
if( (path = (char *) malloc(19)) != NULL )
|
||||
if (strstr(dev, "nvram") && sscanf(dev, "mtd%d: %08x", &i, &esz))
|
||||
{
|
||||
nvram_erase_size = esz;
|
||||
|
||||
sprintf(dev, "/dev/mtdblock/%d", i);
|
||||
if( stat(dev, &s) > -1 && (s.st_mode & S_IFBLK) )
|
||||
{
|
||||
nvram_erase_size = esz;
|
||||
snprintf(path, 19, "/dev/mtdblock/%d", i);
|
||||
break;
|
||||
if( (path = (char *) malloc(strlen(dev)+1)) != NULL )
|
||||
{
|
||||
strncpy(path, dev, strlen(dev)+1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sprintf(dev, "/dev/mtdblock%d", i);
|
||||
if( stat(dev, &s) > -1 && (s.st_mode & S_IFBLK) )
|
||||
{
|
||||
if( (path = (char *) malloc(strlen(dev)+1)) != NULL )
|
||||
{
|
||||
strncpy(path, dev, strlen(dev)+1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -24,8 +24,6 @@
|
||||
#include <errno.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <linux/limits.h>
|
||||
|
||||
#include "sdinitvals.h"
|
||||
|
Loading…
Reference in New Issue
Block a user