G2/cross-usb
1
0
Fork 0
mirror of https://github.com/G2-Games/cross-usb.git synced 2025-04-19 05:12:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fixed not compiling on WASM

Browse source
This commit is contained in:
G2-Games 2024-04-23 11:33:11 -05:00
parent bbdb47add7
commit 9597aef05c
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.cargo/config.toml
View file

@ -3,5 +3,5 @@ rustflags = ["--cfg=web_sys_unstable_apis"]
[build]
#just comment in the "current" target
target = "x86_64-unknown-linux-gnu"
#target = "wasm32-unknown-unknown"
#target = "x86_64-unknown-linux-gnu"
target = "wasm32-unknown-unknown"

28
src/backend/wasm.rs
View file

@ -10,24 +10,24 @@ use web_sys::{
// Crate stuff
use crate::usb::{
ControlIn, ControlOut, ControlType, Descriptor, Device, Interface, Recipient, UsbError,
ControlIn, ControlOut, ControlType, UsbDescriptor, UsbDevice, UsbInterface, Recipient, UsbError,
};
#[wasm_bindgen]
#[derive(Debug)]
pub struct UsbDescriptor {
pub struct Descriptor {
device: WasmUsbDevice,
}
#[wasm_bindgen]
#[derive(Debug)]
pub struct UsbDevice {
pub struct Device {
device: WasmUsbDevice,
}
#[wasm_bindgen]
#[derive(Debug)]
pub struct UsbInterface {
pub struct Interface {
device: WasmUsbDevice,
_number: u8,
}
@ -61,7 +61,7 @@ impl DeviceFilter {
}
#[wasm_bindgen]
pub async fn get_device(device_filter: Vec<DeviceFilter>) -> Result<UsbDescriptor, js_sys::Error> {
pub async fn get_device(device_filter: Vec<DeviceFilter>) -> Result<Descriptor, js_sys::Error> {
let window = web_sys::window().unwrap();
let navigator = window.navigator();
@ -102,7 +102,7 @@ pub async fn get_device(device_filter: Vec<DeviceFilter>) -> Result<UsbDescripto
result
}) {
let _open_promise = JsFuture::from(Promise::resolve(&device.open())).await?;
return Ok(UsbDescriptor { device });
return Ok(Descriptor { device });
}
}
@ -161,7 +161,7 @@ pub async fn get_device(device_filter: Vec<DeviceFilter>) -> Result<UsbDescripto
let _open_promise = JsFuture::from(Promise::resolve(&device.open())).await?;
Ok(UsbDescriptor { device })
Ok(Descriptor { device })
}
/*
@ -273,8 +273,8 @@ pub async fn get_device_list(device_filter: Vec<DeviceFilter>) -> Result<Vec<Usb
}
*/
impl Descriptor for UsbDescriptor {
type Device = UsbDevice;
impl UsbDescriptor for Descriptor {
type Device = Device;
async fn open(self) -> Result<Self::Device, UsbError> {
Ok(Self::Device {
@ -307,10 +307,10 @@ impl Descriptor for UsbDescriptor {
}
}
impl Device for UsbDevice {
type Interface = UsbInterface;
impl UsbDevice for Device {
type Interface = Interface;
async fn open_interface(&self, number: u8) -> Result<UsbInterface, UsbError> {
async fn open_interface(&self, number: u8) -> Result<Interface, UsbError> {
let dev_promise =
JsFuture::from(Promise::resolve(&self.device.claim_interface(number))).await;
@ -324,7 +324,7 @@ impl Device for UsbDevice {
}
};
Ok(UsbInterface {
Ok(Interface {
device: self.device.clone(),
_number: number,
})
@ -381,7 +381,7 @@ impl Device for UsbDevice {
}
}
impl<'a> Interface<'a> for UsbInterface {
impl<'a> UsbInterface<'a> for Interface {
async fn control_in(&self, data: crate::usb::ControlIn) -> Result<Vec<u8>, UsbError> {
let length = data.length;
let params: UsbControlTransferParameters = data.into();