summary refs log tree commit diff
path: root/devices/src/register_space
diff options
context:
space:
mode:
authorJingkui Wang <jkwang@google.com>2019-03-07 15:09:44 -0800
committerchrome-bot <chrome-bot@chromium.org>2019-03-13 21:04:58 -0700
commit199d622703b86c78a461e125b01bde31190645ae (patch)
tree98518f58b88a5ff351c3b5422aefe4134a4b285f /devices/src/register_space
parent280ff786758654bcc38bb383a4eb7b46f02a4b77 (diff)
downloadcrosvm-199d622703b86c78a461e125b01bde31190645ae.tar
crosvm-199d622703b86c78a461e125b01bde31190645ae.tar.gz
crosvm-199d622703b86c78a461e125b01bde31190645ae.tar.bz2
crosvm-199d622703b86c78a461e125b01bde31190645ae.tar.lz
crosvm-199d622703b86c78a461e125b01bde31190645ae.tar.xz
crosvm-199d622703b86c78a461e125b01bde31190645ae.tar.zst
crosvm-199d622703b86c78a461e125b01bde31190645ae.zip
devices: compile usb module and update current code
This patch did the following:
    start compile usb module
    fix register macro
    update error handling
    reformat code
    update xhci reg setup to support usb3 and usb2

BUG=chromium:831850
TEST=local build
CQ-DEPEND=CL:1510813
Change-Id: I851cf02d01ae6e988b2628552cf57c1f43aa86c8
Reviewed-on: https://chromium-review.googlesource.com/1510814
Commit-Ready: Jingkui Wang <jkwang@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Jingkui Wang <jkwang@google.com>
Diffstat (limited to 'devices/src/register_space')
-rw-r--r--devices/src/register_space/register.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/devices/src/register_space/register.rs b/devices/src/register_space/register.rs
index 4c02991..abe9bb6 100644
--- a/devices/src/register_space/register.rs
+++ b/devices/src/register_space/register.rs
@@ -172,7 +172,7 @@ where
 #[macro_export]
 macro_rules! static_register {
     (ty: $ty:ty,offset: $offset:expr,value: $value:expr,) => {{
-        use super::*;
+        use register_space::*;
         static REG_SPEC: StaticRegisterSpec<$ty> = StaticRegisterSpec::<$ty> {
             offset: $offset,
             value: $value,
@@ -356,7 +356,7 @@ macro_rules! register {
         guest_writeable_mask: $mask:expr,
         guest_write_1_to_clear_mask: $w1tcm:expr,
     ) => {{
-        use super::*;
+        use register_space::*;
         let spec: RegisterSpec<$ty> = RegisterSpec::<$ty> {
             name: String::from($name),
             offset: $offset,
@@ -367,7 +367,7 @@ macro_rules! register {
         Register::<$ty>::new(spec, $rv)
     }};
     (name: $name:tt, ty: $ty:ty,offset: $offset:expr,reset_value: $rv:expr,) => {{
-        use super::*;
+        use register_space::*;
         let spec: RegisterSpec<$ty> = RegisterSpec::<$ty> {
             name: String::from($name),
             offset: $offset,
@@ -392,7 +392,7 @@ macro_rules! register_array {
         $gwm:expr,guest_write_1_to_clear_mask:
         $gw1tcm:expr,
     ) => {{
-        use super::*;
+        use register_space::*;
         let mut v: Vec<Register<$ty>> = Vec::new();
         for i in 0..$cnt {
             let offset = $base_offset + ($stride * i) as RegisterOffset;