Skip to content

Commit

Permalink
Upgrade ffigen 5.0.0-dev.0
Browse files Browse the repository at this point in the history
Signed-off-by: wangkun <wangkun@woodemi.com>
  • Loading branch information
wangkun committed Feb 7, 2022
1 parent 24537b1 commit 0763bbd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
15 changes: 8 additions & 7 deletions example/listDeviceProducts.dart
Expand Up @@ -2,7 +2,7 @@ import 'dart:convert';
import 'dart:ffi';
import 'dart:io';

import 'package:ffi/ffi.dart' show calloc;
import 'package:ffi/ffi.dart' show UnsignedChar, calloc;
import 'package:libusb/libusb_linux.dart';

final DynamicLibrary Function() loadLibrary = () {
Expand Down Expand Up @@ -56,7 +56,7 @@ class QuickUsb {
var descPtr = calloc<libusb_device_descriptor>();
var devHandlePtr = calloc<Pointer<libusb_device_handle>>();
final strDescLength = 42;
var strDescPtr = calloc<Uint8>(strDescLength);
var strDescPtr = calloc<UnsignedChar>(strDescLength);

for (var i = 0; deviceList[i] != nullptr; i++) {
var deviceProduct = _getDeviceProduct(
Expand All @@ -73,7 +73,7 @@ class QuickUsb {
Pointer<libusb_device> dev,
Pointer<libusb_device_descriptor> descPtr,
Pointer<Pointer<libusb_device_handle>> devHandlePtr,
Pointer<Uint8> strDescPtr,
Pointer<UnsignedChar> strDescPtr,
int strDescLength,
) {
var devDesc = _libusb.libusb_get_device_descriptor(dev, descPtr);
Expand Down Expand Up @@ -112,7 +112,7 @@ class QuickUsb {
print('$idDevice prodDesc error: ${_libusb.describeError(prodDesc)}');
return MapEntry(idDevice, '');
}
return MapEntry(idDevice, utf8.decode(strDescPtr.asTypedList(prodDesc)));
return MapEntry(idDevice, utf8.decode(strDescPtr.cast<Uint8>().asTypedList(prodDesc)));
} finally {
_libusb.libusb_close(devHandle);
}
Expand All @@ -126,9 +126,10 @@ final int _maxSize = sizeOf<IntPtr>() == 8 ? _kMaxSmi64 : _kMaxSmi32;
extension LibusbExtension on Libusb {
String describeError(int error) {
var array = _libusb.libusb_error_name(error);
var nativeString = array.asTypedList(_maxSize);
// FIXME array is Pointer<Char>, not Pointer<Uint8>
var nativeString = array.cast<Uint8>().asTypedList(_maxSize);
var strlen = nativeString.indexWhere((char) => char == 0);
return utf8.decode(array.asTypedList(strlen));
return utf8.decode(array.cast<Uint8>().asTypedList(strlen));
}
}

Expand All @@ -138,7 +139,7 @@ extension LibusbInline on Libusb {
Pointer<libusb_device_handle> dev_handle,
int desc_index,
int langid,
Pointer<Uint8> data,
Pointer<UnsignedChar> data,
int length,
) {
return libusb_control_transfer(
Expand Down
6 changes: 3 additions & 3 deletions pubspec.lock
Expand Up @@ -84,14 +84,14 @@ packages:
name: ffi
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.1.2"
version: "1.2.0-dev.0"
ffigen:
dependency: "direct dev"
description:
name: ffigen
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.1.3"
version: "5.0.0-dev.0"
file:
dependency: transitive
description:
Expand Down Expand Up @@ -359,4 +359,4 @@ packages:
source: hosted
version: "3.1.0"
sdks:
dart: ">=2.14.0 <3.0.0"
dart: ">=2.16.0 <3.0.0"
6 changes: 3 additions & 3 deletions pubspec.yaml
Expand Up @@ -4,19 +4,19 @@ version: 0.3.23+1
homepage: https://github.com/woodemi/libusb.dart

environment:
sdk: '>=2.14.0 <3.0.0'
sdk: '>=2.16.0 <3.0.0'

platforms:
linux:
macos:
windows:

dependencies:
ffi: ^1.0.0
ffi: ^1.2.0-dev.0

dev_dependencies:
pedantic: ^1.10.0
ffigen: ^4.0.0
ffigen: ^5.0.0-dev.0
test: ^1.16.3
convert: ^3.0.0

Expand Down

0 comments on commit 0763bbd

Please sign in to comment.