File tree Expand file tree Collapse file tree
nordic/nrf52840_dongle/src Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -15,8 +15,6 @@ use kernel::component::Component;
1515use kernel:: debug:: PanicResources ;
1616use kernel:: hil;
1717use kernel:: hil:: led:: LedHigh ;
18- use kernel:: hil:: symmetric_encryption:: AES ;
19- use kernel:: hil:: time:: Alarm ;
2018use kernel:: hil:: time:: Counter ;
2119use kernel:: hil:: usb:: Client ;
2220use kernel:: platform:: chip:: Chip ;
Original file line number Diff line number Diff line change @@ -47,17 +47,17 @@ macro_rules! aes_mux_component_static {
4747pub type AesMuxComponentType < A > =
4848 capsules_core:: virtualizers:: virtual_aes_ccm:: MuxAES128CCM < ' static , A > ;
4949
50- pub struct AesMuxComponent < A : ' static + AES128 < ' static > + AES128Ctr + AES128CBC + AES128ECB > {
50+ pub struct AesMuxComponent < A : ' static + AES < ' static , AES128 > + AESCtr + AESCBC + AESECB > {
5151 aes : & ' static A ,
5252}
5353
54- impl < A : ' static + AES128 < ' static > + AES128Ctr + AES128CBC + AES128ECB > AesMuxComponent < A > {
54+ impl < A : ' static + AES < ' static , AES128 > + AESCtr + AESCBC + AESECB > AesMuxComponent < A > {
5555 pub fn new ( aes : & ' static A ) -> Self {
5656 Self { aes }
5757 }
5858}
5959
60- impl < A : ' static + AES128 < ' static > + AES128Ctr + AES128CBC + AES128ECB > Component
60+ impl < A : ' static + AES < ' static , AES128 > + AESCtr + AESCBC + AESECB > Component
6161 for AesMuxComponent < A >
6262{
6363 type StaticInput = & ' static mut MaybeUninit <
@@ -70,7 +70,7 @@ impl<A: 'static + AES128<'static> + AES128Ctr + AES128CBC + AES128ECB> Component
7070 . write ( capsules_core:: virtualizers:: virtual_aes_ccm:: MuxAES128CCM :: new ( self . aes ) ) ;
7171
7272 DeferredCallClient :: register ( aes_mux) ;
73- hil:: symmetric_encryption:: AES128 :: set_client ( self . aes , aes_mux) ;
73+ hil:: symmetric_encryption:: AES :: set_client ( self . aes , aes_mux) ;
7474
7575 aes_mux
7676 }
Original file line number Diff line number Diff line change 1414use kernel:: component:: Component ;
1515use kernel:: debug:: PanicResources ;
1616use kernel:: hil:: led:: LedLow ;
17- use kernel:: hil:: symmetric_encryption:: AES ;
1817use kernel:: hil:: time:: Counter ;
1918use kernel:: platform:: chip:: Chip ;
2019use kernel:: platform:: { KernelResources , SyscallDriverLookup } ;
Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ use kernel::hil::gpio::Configure;
1717use kernel:: hil:: gpio:: FloatingState ;
1818use kernel:: hil:: i2c:: { I2CMaster , I2CSlave } ;
1919use kernel:: hil:: led:: LedLow ;
20- use kernel:: hil:: symmetric_encryption:: AES ;
2120use kernel:: hil:: time:: Counter ;
2221use kernel:: platform:: chip:: Chip ;
2322use kernel:: platform:: { KernelResources , SyscallDriverLookup } ;
Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ use kernel::component::Component;
2020use kernel:: debug:: PanicResources ;
2121use kernel:: hil:: led:: LedHigh ;
2222use kernel:: hil:: screen:: Screen ;
23- use kernel:: hil:: symmetric_encryption:: AES ;
2423use kernel:: hil:: time:: Counter ;
2524use kernel:: platform:: chip:: Chip ;
2625use kernel:: platform:: { KernelResources , SyscallDriverLookup } ;
You can’t perform that action at this time.
0 commit comments