head	1.3;
access;
symbols
	pkgsrc-2023Q3:1.2.0.32
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.30
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.28
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.26
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.24
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.22
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.20
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.18
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.16
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.14
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.12
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.10
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.8
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.6
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.2
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.4
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.1.0.10
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.8
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.6
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2
	pkgsrc-2018Q3-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2023.10.14.16.09.33;	author tnn;	state dead;
branches;
next	1.2;
commitid	pqfEODZWDbQ4WBIE;

1.2
date	2019.10.25.10.10.10;	author kamil;	state Exp;
branches;
next	1.1;
commitid	bWiPbndMkNyryeIB;

1.1
date	2018.08.31.10.09.51;	author tnn;	state Exp;
branches;
next	;
commitid	xbS75xMprtBp3gQA;


desc
@@


1.3
log
@rkdeveloptool: update to 1.32

This is needed to support maskrom recovery via USB-downloaded
SPL loader on 356x and 3588 SoCs.
@
text
@$NetBSD: patch-main.cpp,v 1.2 2019/10/25 10:10:10 kamil Exp $

match iconv(3) prototype

--- main.cpp.orig	2018-03-28 01:22:40.000000000 +0000
+++ main.cpp
@@@@ -15,6 +15,16 @@@@
 #include "RKComm.h"
 #include "RKDevice.h"
 #include "RKImage.h"
+
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Prereq__(9,99,17)
+#define NETBSD_POSIX_ICONV 1
+#else
+#define NETBSD_POSIX_ICONV 0
+#endif
+#endif
+
 extern const char *szManufName[];
 CRKLog *g_pLogObject=NULL;
 CONFIG_ITEM_VECTOR g_ConfigItemVec;
@@@@ -168,7 +178,11 @@@@ bool StringToWideString(char *pszSrc, wc
 	pIn = (char *)pszSrc;
 	pOut = (char *)pszDest;
 
-	iRet = iconv(cd, (char **)&pIn, (size_t *)&nSrcLen, (char **)&pOut, (size_t *)&nDestLen);
+#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV
+	iRet = iconv(cd, (const char **)&pIn, (size_t *)&nSrcLen, (char **)&pOut, (size_t *)&nDestLen);
+#else
+	iRet = iconv(cd, &pIn, (size_t *)&nSrcLen, (char **)&pOut, (size_t *)&nDestLen);
+#endif
 
 	if(iRet == -1) {
 		delete []pszDest;
@@@@ -205,7 +219,11 @@@@ bool WideStringToString(wchar_t *pszSrc,
 	char *pIn, *pOut;
 	pIn = (char *)pszSrc;
 	pOut = (char *)pszDest;
+#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV
+	iRet = iconv(cd, (const char **)&pIn, (size_t *)&nSrcLen, (char **)&pOut, (size_t *)&nDestLen);
+#else
 	iRet = iconv(cd, (char **)&pIn, (size_t *)&nSrcLen, (char **)&pOut, (size_t *)&nDestLen);
+#endif
 
 	if(iRet == -1) {
 		delete []pszDest;
@


1.2
log
@rkdeveloptool: Fix build on NetBSD 9.99.17

Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.
@
text
@d1 1
a1 1
$NetBSD: patch-main.cpp,v 1.1 2018/08/31 10:09:51 tnn Exp $
@


1.1
log
@sysutils/rkdeveloptool: import rkdeveloptool-1.3

rkdeveloptool is a libusb-based utility for working with RockUSB devices.
RockUSB is a vendor specific USB class from Rockchip, used for firmware
download for Rockchip SoCs.
@
text
@d1 1
a1 1
$NetBSD$
d7 18
a24 1
@@@@ -168,7 +168,7 @@@@ bool StringToWideString(char *pszSrc, wc
d29 1
d31 3
d37 1
a37 1
@@@@ -205,7 +205,7 @@@@ bool WideStringToString(wchar_t *pszSrc,
d41 1
a41 1
-	iRet = iconv(cd, (char **)&pIn, (size_t *)&nSrcLen, (char **)&pOut, (size_t *)&nDestLen);
d43 3
@