cleanup headers

nandtool/flashmng.c

@@ -42,7 +42,7 @@ static struct cleanmarker {
 };
 
 
-int flashmng_readraw(oid_t oid, offs_t addr, void *data, size_t size)
+int flashmng_readraw(oid_t oid, off_t addr, void *data, size_t size)
 {
 	msg_t msg = { 0 };
 	flash_i_devctl_t *idevctl = (flash_i_devctl_t *)msg.i.raw;

nandtool/flashmng.h

@@ -18,7 +18,7 @@
 #include <imx6ull-flashsrv.h>
 
 
-int flashmng_readraw(oid_t oid, offs_t addr, void *data, size_t size);
+int flashmng_readraw(oid_t oid, off_t addr, void *data, size_t size);
 
 
 int flashmng_writeraw(oid_t oid, unsigned int page, const void *data, size_t size);

nandtool/nandtool.c

@@ -181,8 +181,8 @@ static int nandtool_dump(const char *outpath, unsigned int start, unsigned int n
 {
 	const flashsrv_info_t *info;
 	ssize_t len;
-	offs_t blocksz, partsz, pagesz;
-	offs_t addr, endaddr, bytes;
+	off_t blocksz, partsz, pagesz;
+	off_t addr, endaddr, bytes;
 	uint8_t *buf;
 	int ret = 0;
 	int outfd;

psd/imx6ull/bcb.c

@@ -75,7 +75,7 @@ int dbbt_flash(oid_t oid, int fd, dbbt_t *dbbt, const flashsrv_info_t *info)
 	int err;
 
 	/* DBBT is just after BCB_CNT FCB blocks on the same partition */
-	offs_t partoff = BCB_CNT * info->erasesz;
+	off_t partoff = BCB_CNT * info->erasesz;
 
 	dbbt_fingerprint(dbbt);
 	dbbt->size = 1;

psd/imx6ull/psd.c

@@ -85,8 +85,8 @@ struct {
 	char rcvBuff[HID_REPORT_2_SIZE];
 	char buff[_PAGE_SIZE * 2]; /* assuming always big enough to fit psd_common.flash.writesz */
 
-	offs_t partsz;
-	offs_t partOffs;
+	off_t partsz;
+	off_t partOffs;
 
 	unsigned int nfiles;
 	struct filedes *f;
@@ -353,7 +353,7 @@ static int psd_writeRegister(sdp_cmd_t *cmd)
 static int psd_writeFile(sdp_cmd_t *cmd)
 {
 	int res, err = hidOK, buffOffset = 0, badBlock = 0;
-	offs_t writesz, fileOffs = cmd->address;
+	off_t writesz, fileOffs = cmd->address;
 	char *outdata = NULL;
 
 	/* Check command parameters */

psd/imxrt/psd.c

@@ -26,7 +26,7 @@
 #include <sys/reboot.h>
 
 #include <imxrt-flashsrv.h>
-#include <phoenix/arch/imxrt.h>
+#include <phoenix/arch/armv7m/imxrt/10xx/imxrt10xx.h>
 
 #include "../common/sdp.h"
 
@@ -264,7 +264,7 @@
 int psd_writeFile(sdp_cmd_t *cmd)
 {
 	int res, err = hidOK, offset = 0;
-	offs_t writesz;
+	off_t writesz;
 	char *outdata = NULL;
 
 	flash_properties_t *flash = (flash_properties_t *)&psd_common.flashMems[psd_common.flashID];

psh/ls/ls.c

@@ -342,7 +342,7 @@ static void psh_ls_printlong(size_t nfiles)
 		printf("%s %*d ", perms, linksz, files[i].stat.st_nlink);
 		printf("%-*s ", usersz, (files[i].pw != NULL) ? files[i].pw->pw_name : "---");
 		printf("%-*s ", grpsz, (files[i].gr != NULL) ? files[i].gr->gr_name : "---");
-		printf("%*lld %s ", sizesz, files[i].stat.st_size, buff);
+		printf("%*lld %s ", sizesz, (long long)files[i].stat.st_size, buff);
 
 		psh_ls_printfile(&files[i], files[i].namelen);
 		putchar('\n');

psh/mem/mem.c

@@ -74,7 +74,7 @@ static void psh_mem_procprint(entryinfo_t *e, int mapsz)
 		printf("%p:%p  %-4s  %-5s", e->vaddr, e->vaddr + e->size - 1, prot, flags);
 
 		if (e->offs != -1)
-			printf("  %*llx", (int)(2 * sizeof(e->offs)), e->offs);
+			printf("  %*llx", (int)(2 * sizeof(e->offs)), (long long)e->offs);
 		else
 			printf("  %*s", (int)(2 * sizeof(e->offs)), "");