removes metadata storage type (#538)
This commit is contained in:
@@ -31,19 +31,18 @@ index 5465c95f4..e596648f7 100644
|
||||
}
|
||||
}
|
||||
diff --git a/kernel/src/sched.rs b/kernel/src/sched.rs
|
||||
index 8844bc6c3..692bad2d3 100644
|
||||
index 8844bc6c3..00c13a7c6 100644
|
||||
--- a/kernel/src/sched.rs
|
||||
+++ b/kernel/src/sched.rs
|
||||
@@ -118,10 +118,19 @@ pub enum SchedulingDecision {
|
||||
@@ -118,10 +118,18 @@ pub enum SchedulingDecision {
|
||||
TrySleep,
|
||||
}
|
||||
|
||||
+/// Represents the type of a storage slice.
|
||||
+#[derive(Copy, Clone)]
|
||||
+pub enum StorageType {
|
||||
+ STORE = 1,
|
||||
+ PARTITION = 2,
|
||||
+ METADATA = 3,
|
||||
+ Store = 1,
|
||||
+ Partition = 2,
|
||||
+}
|
||||
+
|
||||
/// Represents a storage location in flash.
|
||||
|
||||
@@ -156,7 +156,7 @@ index f7899d8c5..6956523c6 100644
|
||||
hil::usb::CtrlSetupResult::ErrGeneric
|
||||
}
|
||||
diff --git a/capsules/src/usb/usbc_ctap_hid.rs b/capsules/src/usb/usbc_ctap_hid.rs
|
||||
index 642039120..adb7fde14 100644
|
||||
index 642039120..abf224f97 100644
|
||||
--- a/capsules/src/usb/usbc_ctap_hid.rs
|
||||
+++ b/capsules/src/usb/usbc_ctap_hid.rs
|
||||
@@ -44,21 +44,59 @@ static CTAP_REPORT_DESCRIPTOR: &'static [u8] = &[
|
||||
|
||||
@@ -262,7 +262,7 @@ index da3d16d85..e8f1a87a4 100644
|
||||
if !app.waiting {
|
||||
// The call to receive_packet() collected a pending packet.
|
||||
diff --git a/capsules/src/usb/usbc_ctap_hid.rs b/capsules/src/usb/usbc_ctap_hid.rs
|
||||
index adb7fde14..f6762b4b9 100644
|
||||
index abf224f97..d47e5f644 100644
|
||||
--- a/capsules/src/usb/usbc_ctap_hid.rs
|
||||
+++ b/capsules/src/usb/usbc_ctap_hid.rs
|
||||
@@ -11,6 +11,7 @@ use super::descriptors::HIDSubordinateDescriptor;
|
||||
|
||||
@@ -108,7 +108,7 @@ index e8f1a87a4..2c91c0968 100644
|
||||
} else {
|
||||
// Cannot cancel now because the transaction is already in process.
|
||||
diff --git a/capsules/src/usb/usbc_ctap_hid.rs b/capsules/src/usb/usbc_ctap_hid.rs
|
||||
index f6762b4b9..16b80cb10 100644
|
||||
index d47e5f644..76f6af73b 100644
|
||||
--- a/capsules/src/usb/usbc_ctap_hid.rs
|
||||
+++ b/capsules/src/usb/usbc_ctap_hid.rs
|
||||
@@ -18,13 +18,27 @@ use core::cell::Cell;
|
||||
|
||||
Reference in New Issue
Block a user