From 5d8efec3f6128c0b925cf8fab0a536231176ffde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Guti=C3=83errez?= Date: Sat, 27 Mar 2021 22:02:36 +0100 Subject: [PATCH] fix for interface changes --- os_dep/osdep_service.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 0d11234..e4893a7 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -1957,13 +1957,8 @@ static int isFileReadable(char *path) ret = PTR_ERR(fp); } else { - oldfs = get_fs(); set_fs(KERNEL_DS); - - if(1!=readFile(fp, &buf, 1)) - ret = PTR_ERR(fp); - - set_fs(oldfs); - filp_close(fp,NULL); + ret = kernel_read(fp, &buf, 1, NULL); + closeFile(fp); } return ret; } @@ -1984,10 +1979,7 @@ static int retriveFromFile(char *path, u8* buf, u32 sz) if(path && buf) { if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){ DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); - - oldfs = get_fs(); set_fs(KERNEL_DS); - ret=readFile(fp, buf, sz); - set_fs(oldfs); + ret = kernel_read(fp, buf, sz, NULL); closeFile(fp); DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret); @@ -2018,10 +2010,7 @@ static int storeToFile(char *path, u8* buf, u32 sz) if(path && buf) { if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); - - oldfs = get_fs(); set_fs(KERNEL_DS); - ret=writeFile(fp, buf, sz); - set_fs(oldfs); + ret = kernel_write(fp, buf, sz, NULL); closeFile(fp); DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret);