Skip to content

Commit e172863

Browse files
committed
Switch to tock-registers: Sources for tutorials 13..02
1 parent 7c0272c commit e172863

File tree

82 files changed

+368
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+368
-321
lines changed

02_runtime_init/Cargo.lock

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

02_runtime_init/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ path = "src/main.rs"
2424

2525
# Platform specific dependencies
2626
[target.'cfg(target_arch = "aarch64")'.dependencies]
27-
cortex-a = { version = "5.x.x" }
27+
cortex-a = { version = "6.x.x" }
28+

03_hacky_hello_world/Cargo.lock

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

03_hacky_hello_world/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ path = "src/main.rs"
2424

2525
# Platform specific dependencies
2626
[target.'cfg(target_arch = "aarch64")'.dependencies]
27-
cortex-a = { version = "5.x.x" }
27+
cortex-a = { version = "6.x.x" }
28+

04_safe_globals/Cargo.lock

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

04_safe_globals/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ path = "src/main.rs"
2424

2525
# Platform specific dependencies
2626
[target.'cfg(target_arch = "aarch64")'.dependencies]
27-
cortex-a = { version = "5.x.x" }
27+
cortex-a = { version = "6.x.x" }
28+

05_drivers_gpio_uart/Cargo.lock

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

05_drivers_gpio_uart/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ lto = true
99

1010
[features]
1111
default = []
12-
bsp_rpi3 = ["register"]
13-
bsp_rpi4 = ["register"]
12+
bsp_rpi3 = ["tock-registers"]
13+
bsp_rpi4 = ["tock-registers"]
1414

1515
[[bin]]
1616
name = "kernel"
@@ -23,8 +23,9 @@ path = "src/main.rs"
2323
[dependencies]
2424

2525
# Optional dependencies
26-
register = { version = "1.x.x", optional = true }
26+
tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true }
2727

2828
# Platform specific dependencies
2929
[target.'cfg(target_arch = "aarch64")'.dependencies]
30-
cortex-a = { version = "5.x.x" }
30+
cortex-a = { version = "6.x.x" }
31+

05_drivers_gpio_uart/src/bsp/device_driver/bcm/bcm2xxx_gpio.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ use crate::{
88
bsp::device_driver::common::MMIODerefWrapper, driver, synchronization,
99
synchronization::NullLock,
1010
};
11-
use register::{mmio::*, register_bitfields, register_structs};
11+
use tock_registers::{
12+
interfaces::{ReadWriteable, Writeable},
13+
register_bitfields, register_structs,
14+
registers::ReadWrite,
15+
};
1216

1317
//--------------------------------------------------------------------------------------------------
1418
// Private Definitions

05_drivers_gpio_uart/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ use crate::{
1414
synchronization::NullLock,
1515
};
1616
use core::fmt;
17-
use register::{mmio::*, register_bitfields, register_structs};
17+
use tock_registers::{
18+
interfaces::{Readable, Writeable},
19+
register_bitfields, register_structs,
20+
registers::{ReadOnly, ReadWrite, WriteOnly},
21+
};
1822

1923
//--------------------------------------------------------------------------------------------------
2024
// Private Definitions
@@ -81,6 +85,7 @@ register_bitfields! {
8185
LCR_H [
8286
/// Word length. These bits indicate the number of data bits transmitted or received in a
8387
/// frame.
88+
#[allow(clippy::enum_variant_names)]
8489
WLEN OFFSET(5) NUMBITS(2) [
8590
FiveBit = 0b00,
8691
SixBit = 0b01,

0 commit comments

Comments
 (0)