[Feature] Add read/write Nand interfaces and modify the test demo
Change-Id: Iede54543e63e2b53c3db89e3ab1a6e5b220541f7
diff --git a/src/lynq/lib/liblynq-fota/include/iot_rock.h b/src/lynq/lib/liblynq-fota/include/iot_rock.h
old mode 100644
new mode 100755
index f0a77e7..d6f0a2c
--- a/src/lynq/lib/liblynq-fota/include/iot_rock.h
+++ b/src/lynq/lib/liblynq-fota/include/iot_rock.h
@@ -1,6 +1,11 @@
#ifndef _IOT_ROCK_H_
#define _IOT_ROCK_H_
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
/* public */
#define E_ROCK_SUCCESS (0)
@@ -119,6 +124,10 @@
//int md5_file_verfy_new(char* filePath, char* file_md5,int packe_len);
int lynq_rock_main(int first_run);
int lynq_fota_func(void);
+int lynq_nand_open(const char *pathname, int flags);
+ssize_t lynq_nand_read(int fd, void *buf, size_t count);
+ssize_t lynq_nand_write(int fd, void *buf, size_t count);
+int lynq_nand_close(int fd);
#endif
diff --git a/src/lynq/lib/liblynq-fota/rock_ua/rock_ua.c b/src/lynq/lib/liblynq-fota/rock_ua/rock_ua.c
old mode 100644
new mode 100755
index f7cb971..90992a3
--- a/src/lynq/lib/liblynq-fota/rock_ua/rock_ua.c
+++ b/src/lynq/lib/liblynq-fota/rock_ua/rock_ua.c
@@ -2090,3 +2090,23 @@
}*/
return 0;
}
+
+int lynq_nand_open(const char *pathname, int flags)
+{
+ return mtk_device_wrap_open(pathname,flags);
+}
+
+ssize_t lynq_nand_read(int fd, void *buf, size_t count)
+{
+ return mtk_device_wrap_read(fd,buf,count);
+}
+
+ssize_t lynq_nand_write(int fd, void *buf, size_t count)
+{
+ return mtk_device_wrap_write(fd,buf,count);
+}
+
+int lynq_nand_close(int fd)
+{
+ return mtk_device_wrap_close(fd);
+}
diff --git a/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/main.c b/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/main.c
index f0b10b2..4af951d 100755
--- a/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/main.c
+++ b/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/main.c
@@ -1,7 +1,6 @@
#include <stdio.h>
#include "include/iot_rock.h"
#include "fcntl.h"
-#include "mtk_device_wrap.h"
#include "liblog/lynq_deflog.h"
@@ -18,7 +17,6 @@
#define FLASH_DEV_DELTA "/dev/mtd41"
#endif
-
int main(int argc,char argv[])
{
@@ -64,10 +62,10 @@
return 1;
}
- fd_target = mtk_device_wrap_open(FLASH_DEV_DELTA,O_RDWR);
+ fd_target = lynq_nand_open(FLASH_DEV_DELTA,O_RDWR);
if (fd_target < 0) {
- mtk_device_wrap_close(fd_target);
+ lynq_nand_close(fd_target);
close(fd_down);
LYERRLOG("+[UA]: open target error\n");
return 1;
@@ -75,11 +73,11 @@
LYVERBLOG("[+UP]: Write data to flash\n");
while(( size = read(fd_down,delta_data,READ_BLOCK_SIZE))>0) {
- mtk_device_wrap_write(fd_target,delta_data,READ_BLOCK_SIZE);
+ lynq_nand_write(fd_target,delta_data,READ_BLOCK_SIZE);
}
LYVERBLOG("[+UP]: Write data to flash success\n");
- mtk_device_wrap_close(fd_target);
+ lynq_nand_close(fd_target);
close(fd_down);
LYVERBLOG("+[UA]: Upgrade to start ret:%d\n",ret);
@@ -92,3 +90,4 @@
return 0;
}
+
diff --git a/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/makefile b/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/makefile
index 312a4dc..d263591 100755
--- a/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/makefile
+++ b/src/lynq/packages/thirdpart/Konoda/lynq-konoda-rock/src/makefile
@@ -26,7 +26,6 @@
-L./lib \
-llog \
-lstdc++ \
- -lnandapi \
-lbootctrl \
-llynq-log \
-llynq-fota \