the rest of the functions wrapped with macro
This commit is contained in:
Vinzenz Schroeter
parent
c492cfab6b
commit
b79a2534fc
7 changed files with 485 additions and 485 deletions
|
|
@ -5,39 +5,33 @@ use crate::{
|
|||
use servicepoint::{ClearCommand, FadeOutCommand, HardResetCommand};
|
||||
use std::ptr::NonNull;
|
||||
|
||||
wrap_functions!(sp_cmd_clear;
|
||||
macro_rules! wrap_cc_only {
|
||||
($prefix:ident :: $typ:ident ; $(#[$meta:meta])*) => {
|
||||
wrap_functions!($prefix;
|
||||
$(#[$meta])*
|
||||
///
|
||||
#[doc = concat!(" Returns: a new [`",stringify!($typ),"`] instance.")]
|
||||
fn new() -> NonNull<$typ> {
|
||||
heap_move_nonnull($typ)
|
||||
}
|
||||
);
|
||||
|
||||
wrap_free!($prefix :: $typ);
|
||||
};
|
||||
}
|
||||
|
||||
wrap_cc_only!(sp_cmd_clear::ClearCommand;
|
||||
/// Set all pixels to the off state.
|
||||
///
|
||||
/// Does not affect brightness.
|
||||
///
|
||||
/// Returns: a new [ClearCommand] instance.
|
||||
fn new() -> NonNull<ClearCommand> {
|
||||
heap_move_nonnull(ClearCommand)
|
||||
}
|
||||
);
|
||||
|
||||
wrap_free!(sp_cmd_clear::ClearCommand);
|
||||
|
||||
wrap_functions!(sp_cmd_hard_reset;
|
||||
wrap_cc_only!(sp_cmd_hard_reset::HardResetCommand;
|
||||
/// Kills the udp daemon on the display, which usually results in a restart.
|
||||
///
|
||||
/// Please do not send this in your normal program flow.
|
||||
///
|
||||
/// Returns: a new [HardResetCommand] instance.
|
||||
fn new() -> NonNull<HardResetCommand> {
|
||||
heap_move_nonnull(HardResetCommand)
|
||||
}
|
||||
);
|
||||
|
||||
wrap_free!(sp_cmd_hard_reset::HardResetCommand);
|
||||
|
||||
wrap_functions!(sp_cmd_fade_out;
|
||||
wrap_cc_only!(sp_cmd_fade_out::FadeOutCommand;
|
||||
/// A yet-to-be-tested command.
|
||||
///
|
||||
/// Returns: a new [FadeOutCommand] instance.
|
||||
fn new() -> NonNull<FadeOutCommand> {
|
||||
heap_move_nonnull(FadeOutCommand)
|
||||
}
|
||||
);
|
||||
|
||||
wrap_free!(sp_cmd_fade_out::FadeOutCommand);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
use crate::mem::{
|
||||
heap_clone, heap_drop, heap_move, heap_move_nonnull, heap_move_ok,
|
||||
heap_remove,
|
||||
use crate::{
|
||||
macros::wrap_functions,
|
||||
mem::{
|
||||
heap_clone, heap_drop, heap_move, heap_move_nonnull, heap_move_ok,
|
||||
heap_remove,
|
||||
},
|
||||
};
|
||||
use servicepoint::{
|
||||
BitVecCommand, BitmapCommand, BrightnessGridCommand, CharGridCommand,
|
||||
|
|
@ -66,233 +69,233 @@ impl SPCommand {
|
|||
};
|
||||
}
|
||||
|
||||
/// Tries to turn a [Packet] into a [SPCommand].
|
||||
///
|
||||
/// The packet is dropped in the process.
|
||||
///
|
||||
/// Returns: pointer to new [SPCommand] instance or NULL if parsing failed.
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_cmd_generic_try_from_packet(
|
||||
packet: NonNull<Packet>,
|
||||
) -> SPCommand {
|
||||
let packet = *unsafe { Box::from_raw(packet.as_ptr()) };
|
||||
servicepoint::TypedCommand::try_from(packet)
|
||||
.map(|value| match value {
|
||||
TypedCommand::Clear(clear) => SPCommand {
|
||||
tag: CommandTag::Clear,
|
||||
data: CommandUnion {
|
||||
clear: heap_move_nonnull(clear),
|
||||
},
|
||||
},
|
||||
TypedCommand::CharGrid(char_grid) => SPCommand {
|
||||
tag: CommandTag::CharGrid,
|
||||
data: CommandUnion {
|
||||
char_grid: heap_move_nonnull(char_grid),
|
||||
},
|
||||
},
|
||||
TypedCommand::Cp437Grid(cp437_grid) => SPCommand {
|
||||
tag: CommandTag::Cp437Grid,
|
||||
data: CommandUnion {
|
||||
cp437_grid: heap_move_nonnull(cp437_grid),
|
||||
},
|
||||
},
|
||||
TypedCommand::Bitmap(bitmap) => SPCommand {
|
||||
tag: CommandTag::Bitmap,
|
||||
data: CommandUnion {
|
||||
bitmap: heap_move_nonnull(bitmap),
|
||||
},
|
||||
},
|
||||
TypedCommand::Brightness(global_brightness) => SPCommand {
|
||||
tag: CommandTag::GlobalBrightness,
|
||||
data: CommandUnion {
|
||||
global_brightness: heap_move_nonnull(global_brightness),
|
||||
},
|
||||
},
|
||||
TypedCommand::BrightnessGrid(brightness_grid) => SPCommand {
|
||||
tag: CommandTag::BrightnessGrid,
|
||||
data: CommandUnion {
|
||||
brightness_grid: heap_move_nonnull(brightness_grid),
|
||||
},
|
||||
},
|
||||
TypedCommand::BitVec(bitvec) => SPCommand {
|
||||
tag: CommandTag::BitVec,
|
||||
data: CommandUnion {
|
||||
bitvec: heap_move_nonnull(bitvec),
|
||||
},
|
||||
},
|
||||
TypedCommand::HardReset(hard_reset) => SPCommand {
|
||||
tag: CommandTag::HardReset,
|
||||
data: CommandUnion {
|
||||
hard_reset: heap_move_nonnull(hard_reset),
|
||||
},
|
||||
},
|
||||
TypedCommand::FadeOut(fade_out) => SPCommand {
|
||||
tag: CommandTag::FadeOut,
|
||||
data: CommandUnion {
|
||||
fade_out: heap_move_nonnull(fade_out),
|
||||
},
|
||||
},
|
||||
#[allow(deprecated)]
|
||||
TypedCommand::BitmapLegacy(bitmap_legacy) => SPCommand {
|
||||
tag: CommandTag::BitmapLegacy,
|
||||
data: CommandUnion {
|
||||
bitmap_legacy: heap_move_nonnull(bitmap_legacy),
|
||||
},
|
||||
},
|
||||
})
|
||||
.unwrap_or_else(move |_| SPCommand {
|
||||
tag: CommandTag::Invalid,
|
||||
data: CommandUnion { null: null_mut() },
|
||||
})
|
||||
}
|
||||
wrap_functions!(sp_cmd_generic;
|
||||
|
||||
/// Clones an [SPCommand] instance.
|
||||
///
|
||||
/// returns: a new [SPCommand] instance.
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_cmd_generic_clone(command: SPCommand) -> SPCommand {
|
||||
unsafe {
|
||||
match command.tag {
|
||||
CommandTag::Clear => SPCommand {
|
||||
tag: CommandTag::Clear,
|
||||
data: CommandUnion {
|
||||
clear: heap_clone(command.data.clear),
|
||||
/// Tries to turn a [Packet] into a [SPCommand].
|
||||
///
|
||||
/// The packet is dropped in the process.
|
||||
///
|
||||
/// Returns: pointer to new [SPCommand] instance or NULL if parsing failed.
|
||||
fn try_from_packet(
|
||||
packet: NonNull<Packet>,
|
||||
) -> SPCommand {
|
||||
let packet = *unsafe { Box::from_raw(packet.as_ptr()) };
|
||||
servicepoint::TypedCommand::try_from(packet)
|
||||
.map(|value| match value {
|
||||
TypedCommand::Clear(clear) => SPCommand {
|
||||
tag: CommandTag::Clear,
|
||||
data: CommandUnion {
|
||||
clear: heap_move_nonnull(clear),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::CharGrid => SPCommand {
|
||||
tag: CommandTag::CharGrid,
|
||||
data: CommandUnion {
|
||||
char_grid: heap_clone(command.data.char_grid),
|
||||
TypedCommand::CharGrid(char_grid) => SPCommand {
|
||||
tag: CommandTag::CharGrid,
|
||||
data: CommandUnion {
|
||||
char_grid: heap_move_nonnull(char_grid),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::Cp437Grid => SPCommand {
|
||||
tag: CommandTag::Cp437Grid,
|
||||
data: CommandUnion {
|
||||
cp437_grid: heap_clone(command.data.cp437_grid),
|
||||
TypedCommand::Cp437Grid(cp437_grid) => SPCommand {
|
||||
tag: CommandTag::Cp437Grid,
|
||||
data: CommandUnion {
|
||||
cp437_grid: heap_move_nonnull(cp437_grid),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::Bitmap => SPCommand {
|
||||
tag: CommandTag::Bitmap,
|
||||
data: CommandUnion {
|
||||
bitmap: heap_clone(command.data.bitmap),
|
||||
TypedCommand::Bitmap(bitmap) => SPCommand {
|
||||
tag: CommandTag::Bitmap,
|
||||
data: CommandUnion {
|
||||
bitmap: heap_move_nonnull(bitmap),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::GlobalBrightness => SPCommand {
|
||||
tag: CommandTag::GlobalBrightness,
|
||||
data: CommandUnion {
|
||||
global_brightness: heap_clone(
|
||||
command.data.global_brightness,
|
||||
),
|
||||
TypedCommand::Brightness(global_brightness) => SPCommand {
|
||||
tag: CommandTag::GlobalBrightness,
|
||||
data: CommandUnion {
|
||||
global_brightness: heap_move_nonnull(global_brightness),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::BrightnessGrid => SPCommand {
|
||||
tag: CommandTag::BrightnessGrid,
|
||||
data: CommandUnion {
|
||||
brightness_grid: heap_clone(command.data.brightness_grid),
|
||||
TypedCommand::BrightnessGrid(brightness_grid) => SPCommand {
|
||||
tag: CommandTag::BrightnessGrid,
|
||||
data: CommandUnion {
|
||||
brightness_grid: heap_move_nonnull(brightness_grid),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::BitVec => SPCommand {
|
||||
tag: CommandTag::BitVec,
|
||||
data: CommandUnion {
|
||||
bitvec: heap_clone(command.data.bitvec),
|
||||
TypedCommand::BitVec(bitvec) => SPCommand {
|
||||
tag: CommandTag::BitVec,
|
||||
data: CommandUnion {
|
||||
bitvec: heap_move_nonnull(bitvec),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::HardReset => SPCommand {
|
||||
tag: CommandTag::HardReset,
|
||||
data: CommandUnion {
|
||||
hard_reset: heap_clone(command.data.hard_reset),
|
||||
TypedCommand::HardReset(hard_reset) => SPCommand {
|
||||
tag: CommandTag::HardReset,
|
||||
data: CommandUnion {
|
||||
hard_reset: heap_move_nonnull(hard_reset),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::FadeOut => SPCommand {
|
||||
tag: CommandTag::FadeOut,
|
||||
data: CommandUnion {
|
||||
fade_out: heap_clone(command.data.fade_out),
|
||||
TypedCommand::FadeOut(fade_out) => SPCommand {
|
||||
tag: CommandTag::FadeOut,
|
||||
data: CommandUnion {
|
||||
fade_out: heap_move_nonnull(fade_out),
|
||||
},
|
||||
},
|
||||
},
|
||||
#[allow(deprecated)]
|
||||
CommandTag::BitmapLegacy => SPCommand {
|
||||
tag: CommandTag::BitmapLegacy,
|
||||
data: CommandUnion {
|
||||
bitmap_legacy: heap_clone(command.data.bitmap_legacy),
|
||||
#[allow(deprecated)]
|
||||
TypedCommand::BitmapLegacy(bitmap_legacy) => SPCommand {
|
||||
tag: CommandTag::BitmapLegacy,
|
||||
data: CommandUnion {
|
||||
bitmap_legacy: heap_move_nonnull(bitmap_legacy),
|
||||
},
|
||||
},
|
||||
},
|
||||
CommandTag::Invalid => SPCommand::INVALID,
|
||||
}
|
||||
})
|
||||
.unwrap_or_else(move |_| SPCommand {
|
||||
tag: CommandTag::Invalid,
|
||||
data: CommandUnion { null: null_mut() },
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Deallocates an [SPCommand].
|
||||
///
|
||||
/// Commands with an invalid `tag` do not have to be freed as the `data` pointer should be null.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// SPCommand c = sp_cmd_clear_into_generic(sp_cmd_clear_new());
|
||||
/// sp_command_free(c);
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_cmd_generic_free(command: SPCommand) {
|
||||
unsafe {
|
||||
match command.tag {
|
||||
CommandTag::Invalid => (),
|
||||
CommandTag::Bitmap => heap_drop(command.data.bitmap),
|
||||
CommandTag::BitVec => heap_drop(command.data.bitvec),
|
||||
CommandTag::BrightnessGrid => {
|
||||
heap_drop(command.data.brightness_grid)
|
||||
/// Clones an [SPCommand] instance.
|
||||
///
|
||||
/// returns: a new [SPCommand] instance.
|
||||
fn clone(command: SPCommand) -> SPCommand {
|
||||
unsafe {
|
||||
match command.tag {
|
||||
CommandTag::Clear => SPCommand {
|
||||
tag: CommandTag::Clear,
|
||||
data: CommandUnion {
|
||||
clear: heap_clone(command.data.clear),
|
||||
},
|
||||
},
|
||||
CommandTag::CharGrid => SPCommand {
|
||||
tag: CommandTag::CharGrid,
|
||||
data: CommandUnion {
|
||||
char_grid: heap_clone(command.data.char_grid),
|
||||
},
|
||||
},
|
||||
CommandTag::Cp437Grid => SPCommand {
|
||||
tag: CommandTag::Cp437Grid,
|
||||
data: CommandUnion {
|
||||
cp437_grid: heap_clone(command.data.cp437_grid),
|
||||
},
|
||||
},
|
||||
CommandTag::Bitmap => SPCommand {
|
||||
tag: CommandTag::Bitmap,
|
||||
data: CommandUnion {
|
||||
bitmap: heap_clone(command.data.bitmap),
|
||||
},
|
||||
},
|
||||
CommandTag::GlobalBrightness => SPCommand {
|
||||
tag: CommandTag::GlobalBrightness,
|
||||
data: CommandUnion {
|
||||
global_brightness: heap_clone(
|
||||
command.data.global_brightness,
|
||||
),
|
||||
},
|
||||
},
|
||||
CommandTag::BrightnessGrid => SPCommand {
|
||||
tag: CommandTag::BrightnessGrid,
|
||||
data: CommandUnion {
|
||||
brightness_grid: heap_clone(command.data.brightness_grid),
|
||||
},
|
||||
},
|
||||
CommandTag::BitVec => SPCommand {
|
||||
tag: CommandTag::BitVec,
|
||||
data: CommandUnion {
|
||||
bitvec: heap_clone(command.data.bitvec),
|
||||
},
|
||||
},
|
||||
CommandTag::HardReset => SPCommand {
|
||||
tag: CommandTag::HardReset,
|
||||
data: CommandUnion {
|
||||
hard_reset: heap_clone(command.data.hard_reset),
|
||||
},
|
||||
},
|
||||
CommandTag::FadeOut => SPCommand {
|
||||
tag: CommandTag::FadeOut,
|
||||
data: CommandUnion {
|
||||
fade_out: heap_clone(command.data.fade_out),
|
||||
},
|
||||
},
|
||||
#[allow(deprecated)]
|
||||
CommandTag::BitmapLegacy => SPCommand {
|
||||
tag: CommandTag::BitmapLegacy,
|
||||
data: CommandUnion {
|
||||
bitmap_legacy: heap_clone(command.data.bitmap_legacy),
|
||||
},
|
||||
},
|
||||
CommandTag::Invalid => SPCommand::INVALID,
|
||||
}
|
||||
CommandTag::CharGrid => heap_drop(command.data.char_grid),
|
||||
CommandTag::Cp437Grid => heap_drop(command.data.cp437_grid),
|
||||
CommandTag::GlobalBrightness => {
|
||||
heap_drop(command.data.global_brightness)
|
||||
}
|
||||
CommandTag::Clear => heap_drop(command.data.clear),
|
||||
CommandTag::HardReset => heap_drop(command.data.hard_reset),
|
||||
CommandTag::FadeOut => heap_drop(command.data.fade_out),
|
||||
CommandTag::BitmapLegacy => heap_drop(command.data.bitmap_legacy),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Tries to turn a [SPCommand] into a [Packet].
|
||||
/// The [SPCommand] gets consumed.
|
||||
///
|
||||
/// Returns tag [CommandTag::Invalid] in case of an error.
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_cmd_generic_into_packet(
|
||||
command: SPCommand,
|
||||
) -> *mut Packet {
|
||||
match command.tag {
|
||||
CommandTag::Invalid => null_mut(),
|
||||
CommandTag::Bitmap => {
|
||||
heap_move_ok(unsafe { heap_remove(command.data.bitmap).try_into() })
|
||||
}
|
||||
CommandTag::BitVec => {
|
||||
heap_move_ok(unsafe { heap_remove(command.data.bitvec).try_into() })
|
||||
}
|
||||
CommandTag::BrightnessGrid => heap_move_ok(unsafe {
|
||||
heap_remove(command.data.brightness_grid).try_into()
|
||||
}),
|
||||
CommandTag::CharGrid => heap_move_ok(unsafe {
|
||||
heap_remove(command.data.char_grid).try_into()
|
||||
}),
|
||||
CommandTag::Cp437Grid => heap_move_ok(unsafe {
|
||||
heap_remove(command.data.cp437_grid).try_into()
|
||||
}),
|
||||
CommandTag::GlobalBrightness => heap_move(unsafe {
|
||||
heap_remove(command.data.global_brightness).into()
|
||||
}),
|
||||
CommandTag::Clear => {
|
||||
heap_move(unsafe { heap_remove(command.data.clear).into() })
|
||||
}
|
||||
CommandTag::HardReset => {
|
||||
heap_move(unsafe { heap_remove(command.data.hard_reset).into() })
|
||||
}
|
||||
CommandTag::FadeOut => {
|
||||
heap_move(unsafe { heap_remove(command.data.fade_out).into() })
|
||||
}
|
||||
CommandTag::BitmapLegacy => {
|
||||
heap_move(unsafe { heap_remove(command.data.bitmap_legacy).into() })
|
||||
/// Deallocates an [SPCommand].
|
||||
///
|
||||
/// Commands with an invalid `tag` do not have to be freed as the `data` pointer should be null.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// SPCommand c = sp_cmd_clear_into_generic(sp_cmd_clear_new());
|
||||
/// sp_command_free(c);
|
||||
/// ```
|
||||
fn free(command: SPCommand) {
|
||||
unsafe {
|
||||
match command.tag {
|
||||
CommandTag::Invalid => (),
|
||||
CommandTag::Bitmap => heap_drop(command.data.bitmap),
|
||||
CommandTag::BitVec => heap_drop(command.data.bitvec),
|
||||
CommandTag::BrightnessGrid => {
|
||||
heap_drop(command.data.brightness_grid)
|
||||
}
|
||||
CommandTag::CharGrid => heap_drop(command.data.char_grid),
|
||||
CommandTag::Cp437Grid => heap_drop(command.data.cp437_grid),
|
||||
CommandTag::GlobalBrightness => {
|
||||
heap_drop(command.data.global_brightness)
|
||||
}
|
||||
CommandTag::Clear => heap_drop(command.data.clear),
|
||||
CommandTag::HardReset => heap_drop(command.data.hard_reset),
|
||||
CommandTag::FadeOut => heap_drop(command.data.fade_out),
|
||||
CommandTag::BitmapLegacy => heap_drop(command.data.bitmap_legacy),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Tries to turn a [SPCommand] into a [Packet].
|
||||
/// The [SPCommand] gets consumed.
|
||||
///
|
||||
/// Returns tag [CommandTag::Invalid] in case of an error.
|
||||
fn into_packet(
|
||||
command: SPCommand,
|
||||
) -> *mut Packet {
|
||||
match command.tag {
|
||||
CommandTag::Invalid => null_mut(),
|
||||
CommandTag::Bitmap => {
|
||||
heap_move_ok(unsafe { heap_remove(command.data.bitmap).try_into() })
|
||||
}
|
||||
CommandTag::BitVec => {
|
||||
heap_move_ok(unsafe { heap_remove(command.data.bitvec).try_into() })
|
||||
}
|
||||
CommandTag::BrightnessGrid => heap_move_ok(unsafe {
|
||||
heap_remove(command.data.brightness_grid).try_into()
|
||||
}),
|
||||
CommandTag::CharGrid => heap_move_ok(unsafe {
|
||||
heap_remove(command.data.char_grid).try_into()
|
||||
}),
|
||||
CommandTag::Cp437Grid => heap_move_ok(unsafe {
|
||||
heap_remove(command.data.cp437_grid).try_into()
|
||||
}),
|
||||
CommandTag::GlobalBrightness => heap_move(unsafe {
|
||||
heap_remove(command.data.global_brightness).into()
|
||||
}),
|
||||
CommandTag::Clear => {
|
||||
heap_move(unsafe { heap_remove(command.data.clear).into() })
|
||||
}
|
||||
CommandTag::HardReset => {
|
||||
heap_move(unsafe { heap_remove(command.data.hard_reset).into() })
|
||||
}
|
||||
CommandTag::FadeOut => {
|
||||
heap_move(unsafe { heap_remove(command.data.fade_out).into() })
|
||||
}
|
||||
CommandTag::BitmapLegacy => {
|
||||
heap_move(unsafe { heap_remove(command.data.bitmap_legacy).into() })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue