Skip to content

Commit 6a5778c

Browse files
authored
Merge pull request #29 from Neotron-Compute/release-0.9.0
Release 0.9.0
2 parents 5bc8996 + 02b4a5c commit 6a5778c

File tree

9 files changed

+86
-363
lines changed

9 files changed

+86
-363
lines changed

Cargo.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[package]
2-
name = "neotron-common-bios"
3-
version = "0.8.0"
42
authors = ["Jonathan 'theJPster' Pallant <[email protected]>"]
5-
edition = "2018"
63
description = "Common BIOS code and API for all Neotron systems."
7-
license = "GPL-3.0-or-later"
8-
repository = "https://github.com/neotron-compute/neotron-common-bios.git"
4+
edition = "2018"
95
homepage = "https://github.com/neotron-compute/neotron-common-bios"
6+
license = "GPL-3.0-or-later"
7+
name = "neotron-common-bios"
108
readme = "README.md"
9+
repository = "https://github.com/neotron-compute/neotron-common-bios.git"
10+
version = "0.9.0"
1111

1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
chrono = { version = "0.4", default-features=false }
15+
chrono = {version = "0.4", default-features = false}
16+
neotron-ffi = "0.1"
1617
pc-keyboard = "0.7"

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ dual licensed as above, without any additional terms or conditions.
4343

4444
* None
4545

46+
### v0.9.0
47+
48+
* Use types from [`neotron-ffi`](https://crates.io/crates/neotron-ffi) crate.
49+
4650
### v0.8.0
4751

4852
* `audio_mixer_channel_get_info` now returns an `Option` not `Result`

src/audio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub enum Direction {
8989
#[derive(Debug, Clone, PartialEq, Eq)]
9090
pub struct MixerChannelInfo {
9191
/// The name of this Audio Mixer Channel (e.g. `Line In`)
92-
pub name: crate::ApiString<'static>,
92+
pub name: crate::FfiString<'static>,
9393
/// Is this an Input or an Output?
9494
pub direction: Direction,
9595
/// What value of `current_level` gives the loudest audio? All values

src/block_dev.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub enum DeviceType {
5555
pub struct DeviceInfo {
5656
/// Some human-readable name for this block device (e.g. `SdCard0` or
5757
/// `CF1`)
58-
pub name: crate::ApiString<'static>,
58+
pub name: crate::FfiString<'static>,
5959
/// The kind of block device this is.
6060
pub device_type: DeviceType,
6161
/// The size of an addressable block, in bytes.

src/bus.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub enum PeripheralKind {
5656
#[derive(Debug, Clone, Eq, PartialEq)]
5757
pub struct PeripheralInfo {
5858
/// A name, such as `slot0`
59-
pub name: crate::ApiString<'static>,
59+
pub name: crate::FfiString<'static>,
6060
/// The kind of peripheral
6161
pub kind: PeripheralKind,
6262
}

src/i2c.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
pub struct BusInfo {
4343
/// Some human-readable name for this I²C device (e.g. `I²C0` or
4444
/// `DDC0`)
45-
pub name: crate::ApiString<'static>,
45+
pub name: crate::FfiString<'static>,
4646
}
4747

4848
// ============================================================================

src/lib.rs

Lines changed: 69 additions & 59 deletions
Large diffs are not rendered by default.

src/serial.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub struct Config {
140140
pub struct DeviceInfo {
141141
/// Some human-readable name for this serial device (e.g. `RS232` or
142142
/// `USB0`)
143-
pub name: crate::ApiString<'static>,
143+
pub name: crate::FfiString<'static>,
144144
/// The type of this serial device
145145
pub device_type: DeviceType,
146146
}

0 commit comments

Comments
 (0)