@@ -215,13 +215,13 @@ pub extern "C" fn hidio_txbyte_bufsize() -> u16 {
215
215
#[ no_mangle]
216
216
pub extern "C" fn hidio_init ( config : HidioConfig ) -> HidioStatus {
217
217
let ids = [
218
- HidIoCommandID :: FlashMode ,
219
- HidIoCommandID :: GetInfo ,
220
- HidIoCommandID :: ManufacturingTest ,
221
- HidIoCommandID :: SleepMode ,
222
- HidIoCommandID :: SupportedIDs ,
223
- HidIoCommandID :: TerminalCmd ,
224
- HidIoCommandID :: TestPacket ,
218
+ HidIoCommandId :: FlashMode ,
219
+ HidIoCommandId :: GetInfo ,
220
+ HidIoCommandId :: ManufacturingTest ,
221
+ HidIoCommandId :: SleepMode ,
222
+ HidIoCommandId :: SupportedIds ,
223
+ HidIoCommandId :: TerminalCmd ,
224
+ HidIoCommandId :: TestPacket ,
225
225
] ;
226
226
227
227
unsafe {
@@ -671,13 +671,13 @@ struct CommandInterface<
671
671
N : ArrayLength < u8 > ,
672
672
H : ArrayLength < u8 > ,
673
673
S : ArrayLength < u8 > ,
674
- ID : ArrayLength < HidIoCommandID > + ArrayLength < u8 > ,
674
+ ID : ArrayLength < HidIoCommandId > + ArrayLength < u8 > ,
675
675
> where
676
676
H : core:: fmt:: Debug ,
677
677
H : Sub < B1 > ,
678
678
H : Sub < U4 > ,
679
679
{
680
- ids : Vec < HidIoCommandID , ID > ,
680
+ ids : Vec < HidIoCommandId , ID > ,
681
681
rx_bytebuf : buffer:: Buffer < RX , N > ,
682
682
rx_packetbuf : HidIoPacketBuffer < H > ,
683
683
tx_bytebuf : buffer:: Buffer < TX , N > ,
@@ -696,15 +696,15 @@ impl<
696
696
N : ArrayLength < u8 > ,
697
697
H : ArrayLength < u8 > ,
698
698
S : ArrayLength < u8 > ,
699
- ID : ArrayLength < HidIoCommandID > + ArrayLength < u8 > ,
699
+ ID : ArrayLength < HidIoCommandId > + ArrayLength < u8 > ,
700
700
> CommandInterface < TX , RX , N , H , S , ID >
701
701
where
702
702
H : core:: fmt:: Debug ,
703
703
H : Sub < B1 > ,
704
704
H : Sub < U4 > ,
705
705
{
706
706
fn new (
707
- ids : & [ HidIoCommandID ] ,
707
+ ids : & [ HidIoCommandId ] ,
708
708
config : HidioConfig ,
709
709
) -> Result < CommandInterface < TX , RX , N , H , S , ID > , CommandError > {
710
710
// Make sure we have a large enough id vec
@@ -901,14 +901,14 @@ where
901
901
/// N - Max payload length (HidIoPacketBuffer), used for default values
902
902
/// H - Max data payload length (HidIoPacketBuffer)
903
903
/// S - Serialization buffer size
904
- /// ID - Max number of HidIoCommandIDs
904
+ /// ID - Max number of HidIoCommandIds
905
905
impl <
906
906
TX : ArrayLength < Vec < u8 , N > > ,
907
907
RX : ArrayLength < Vec < u8 , N > > ,
908
908
N : ArrayLength < u8 > ,
909
909
H : ArrayLength < u8 > ,
910
910
S : ArrayLength < u8 > ,
911
- ID : ArrayLength < HidIoCommandID > + ArrayLength < u8 > ,
911
+ ID : ArrayLength < HidIoCommandId > + ArrayLength < u8 > ,
912
912
> Commands < H , ID > for CommandInterface < TX , RX , N , H , S , ID >
913
913
where
914
914
H : core:: fmt:: Debug + Sub < B1 > + Sub < U4 > ,
@@ -954,7 +954,7 @@ where
954
954
}
955
955
Ok ( ( ) )
956
956
}
957
- fn supported_id ( & self , id : HidIoCommandID ) -> bool {
957
+ fn supported_id ( & self , id : HidIoCommandId ) -> bool {
958
958
self . ids . iter ( ) . any ( |& i| i == id)
959
959
}
960
960
@@ -973,7 +973,7 @@ where
973
973
use h0001:: * ;
974
974
975
975
let property = data. property ;
976
- let os = OSType :: Unknown ;
976
+ let os = OsType :: Unknown ;
977
977
let mut number = 0 ;
978
978
let mut string = String :: new ( ) ;
979
979
@@ -1001,7 +1001,7 @@ where
1001
1001
}
1002
1002
} ;
1003
1003
}
1004
- Property :: DeviceMCU => {
1004
+ Property :: DeviceMcu => {
1005
1005
unsafe {
1006
1006
if let Ok ( cstr) = CStr :: from_ptr ( self . config . device_mcu ) . to_str ( ) {
1007
1007
string = String :: from ( cstr) ;
0 commit comments