use NotNull for parameters

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -408,7 +408,7 @@ dependencies = [
 [[package]]
 name = "servicepoint"
 version = "0.13.2"
-source = "git+https://git.berlin.ccc.de/servicepoint/servicepoint/?branch=next#fe67160974d9fed542eb37e5e9a202eaf6fe00dc"
+source = "git+https://git.berlin.ccc.de/servicepoint/servicepoint/?branch=next#971bee5065139f220022e8108cfaa9c263b8a8a0"
 dependencies = [
  "bitvec",
  "bzip2",

build.rs

@@ -6,28 +6,30 @@
 
 use std::{env, fs::copy};
 
-use cbindgen::{generate_with_config, Config};
-
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     println!("cargo::rerun-if-changed={crate_dir}");
 
     let config =
-        Config::from_file(crate_dir.clone() + "/cbindgen.toml").unwrap();
+        cbindgen::Config::from_file(crate_dir.clone() + "/cbindgen.toml")
+            .unwrap();
 
     let output_dir = env::var("OUT_DIR").unwrap();
     let header_file = output_dir.clone() + "/servicepoint.h";
 
-    generate_with_config(crate_dir, config)
+    if let Ok(bindings) = cbindgen::generate_with_config(crate_dir, config) {
-        .unwrap()
+        bindings.write_to_file(&header_file);
-        .write_to_file(&header_file);
-    println!("cargo:include={output_dir}");
 
-    println!("cargo::rerun-if-env-changed=SERVICEPOINT_HEADER_OUT");
+        println!("cargo:include={output_dir}");
-    if let Ok(header_out) = env::var("SERVICEPOINT_HEADER_OUT") {
+
-        let header_copy = header_out + "/servicepoint.h";
+        println!("cargo::rerun-if-env-changed=SERVICEPOINT_HEADER_OUT");
-        println!("cargo:warning=Copying header to {header_copy}");
+        if let Ok(header_out) = env::var("SERVICEPOINT_HEADER_OUT") {
-        copy(header_file, &header_copy).unwrap();
+            let header_copy = header_out + "/servicepoint.h";
-        println!("cargo::rerun-if-changed={header_copy}");
+            println!("cargo:warning=Copying header to {header_copy}");
+            copy(header_file, &header_copy).unwrap();
+            println!("cargo::rerun-if-changed={header_copy}");
+        }
+    } else {
+        eprintln!("cargo:warning=Servicepoint header could not be generated");
     }
 }

cbindgen.toml

@@ -19,11 +19,13 @@ line_endings = "LF"
 style = "type"
 usize_is_size_t = true
 
-# this is needed because otherwise the order in the C# bindings is different on different machines
+# this is needed because otherwise the order in the C bindings is different on different machines
 sort_by = "Name"
 
 [parse]
-parse_deps = false
+parse_deps = true
+include = ["servicepoint"]
+extra_bindings = ["servicepoint"]
 
 [parse.expand]
 features = ["full"]
@@ -32,5 +34,11 @@ features = ["full"]
 include = []
 exclude = []
 
+[export.rename]
+"TypedCommand" = "Command"
+
 [enum]
 rename_variants = "QualifiedScreamingSnakeCase"
+
+[ptr]
+non_null_attribute = "/*notnull*/"

examples/lang_c/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -423,7 +423,7 @@ dependencies = [
 [[package]]
 name = "servicepoint"
 version = "0.13.2"
-source = "git+https://git.berlin.ccc.de/servicepoint/servicepoint/?branch=next#75d24f658764dea251e28c7067446f3ccfbb89b0"
+source = "git+https://git.berlin.ccc.de/servicepoint/servicepoint/?branch=next#971bee5065139f220022e8108cfaa9c263b8a8a0"
 dependencies = [
  "bitvec",
  "bzip2",

examples/lang_c/Makefile

@@ -36,7 +36,7 @@ CCFLAGS := -static -Os \
 	-fvisibility=hidden \
 	-Bsymbolic \
 	-Wl,--exclude-libs,ALL \
-	-fno-ident \
+	-fno-ident
 	#-fuse-ld=gold \
 	-fno-exceptions
 	#-Wl,--icf=all \

examples/lang_c/src/main.c

@@ -2,21 +2,26 @@
 #include "servicepoint.h"
 
 int main(void) {
-    SPConnection *connection = sp_connection_open("localhost:2342");
+    UdpConnection *connection = sp_connection_open("localhost:2342");
     if (connection == NULL)
         return 1;
 
-    SPBitmap *pixels = sp_bitmap_new(SP_PIXEL_WIDTH, SP_PIXEL_HEIGHT);
+    Bitmap *pixels = sp_bitmap_new(PIXEL_WIDTH, PIXEL_HEIGHT);
     if (pixels == NULL)
       return 1;
 
     sp_bitmap_fill(pixels, true);
 
-    SPCommand *command = sp_command_bitmap_linear_win(0, 0, pixels, SP_COMPRESSION_CODE_UNCOMPRESSED);
+    Command *command = sp_command_bitmap_linear_win(0, 0, pixels, COMPRESSION_CODE_UNCOMPRESSED);
     if (command == NULL)
       return 1;
 
-    sp_connection_send_command(connection, command);
+    Packet *packet = sp_packet_from_command(command);
+
+    Header *header = sp_packet_get_header(packet);
+    printf("[%d, %d, %d, %d, %d]\n", header->command_code, header->a, header->b, header->c, header->d);
+
+    sp_connection_send_packet(connection, packet);
 
     sp_connection_free(connection);
     return 0;

src/bitmap.rs

@@ -1,24 +1,23 @@
 //! C functions for interacting with [SPBitmap]s
 //!
 //! prefix `sp_bitmap_`
+//!
+//! A grid of pixels.
+//!
+//! # Examples
+//!
+//! ```C
+//! Cp437Grid grid = sp_bitmap_new(8, 3);
+//! sp_bitmap_fill(grid, true);
+//! sp_bitmap_set(grid, 0, 0, false);
+//! sp_bitmap_free(grid);
+//! ```
 
-use servicepoint::{DataRef, Grid};
+use servicepoint::{Bitmap, DataRef, Grid};
 use std::ptr::NonNull;
 
 use crate::byte_slice::SPByteSlice;
 
-/// A grid of pixels.
-///
-/// # Examples
-///
-/// ```C
-/// Cp437Grid grid = sp_bitmap_new(8, 3);
-/// sp_bitmap_fill(grid, true);
-/// sp_bitmap_set(grid, 0, 0, false);
-/// sp_bitmap_free(grid);
-/// ```
-pub struct SPBitmap(pub(crate) servicepoint::Bitmap);
-
 /// Creates a new [SPBitmap] with the specified dimensions.
 ///
 /// # Arguments
@@ -44,9 +43,9 @@ pub struct SPBitmap(pub(crate) servicepoint::Bitmap);
 pub unsafe extern "C" fn sp_bitmap_new(
     width: usize,
     height: usize,
-) -> *mut SPBitmap {
+) -> *mut Bitmap {
-    if let Some(bitmap) = servicepoint::Bitmap::new(width, height) {
+    if let Some(bitmap) = Bitmap::new(width, height) {
-        Box::leak(Box::new(SPBitmap(bitmap)))
+        Box::leak(Box::new(bitmap))
     } else {
         std::ptr::null_mut()
     }
@@ -63,8 +62,8 @@ pub unsafe extern "C" fn sp_bitmap_new(
 /// - the returned instance is freed in some way, either by using a consuming function or
 ///   by explicitly calling [sp_bitmap_free].
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitmap_new_screen_sized() -> NonNull<SPBitmap> {
+pub unsafe extern "C" fn sp_bitmap_new_screen_sized() -> NonNull<Bitmap> {
-    let result = Box::new(SPBitmap(servicepoint::Bitmap::max_sized()));
+    let result = Box::new(Bitmap::max_sized());
     NonNull::from(Box::leak(result))
 }
 
@@ -99,13 +98,11 @@ pub unsafe extern "C" fn sp_bitmap_new_screen_sized() -> NonNull<SPBitmap> {
 pub unsafe extern "C" fn sp_bitmap_load(
     width: usize,
     height: usize,
-    data: *const u8,
+    data: SPByteSlice,
-    data_length: usize,
+) -> *mut Bitmap {
-) -> *mut SPBitmap {
+    let data = unsafe { data.as_slice() };
-    assert!(!data.is_null());
+    if let Ok(bitmap) = Bitmap::load(width, height, data) {
-    let data = unsafe { std::slice::from_raw_parts(data, data_length) };
+        Box::leak(Box::new(bitmap))
-    if let Ok(bitmap) = servicepoint::Bitmap::load(width, height, data) {
-        Box::leak(Box::new(SPBitmap(bitmap)))
     } else {
         std::ptr::null_mut()
     }
@@ -129,10 +126,9 @@ pub unsafe extern "C" fn sp_bitmap_load(
 ///   by explicitly calling `sp_bitmap_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitmap_clone(
-    bitmap: *const SPBitmap,
+    bitmap: NonNull<Bitmap>,
-) -> NonNull<SPBitmap> {
+) -> NonNull<Bitmap> {
-    assert!(!bitmap.is_null());
+    let result = Box::new(unsafe { bitmap.as_ref().clone() });
-    let result = Box::new(SPBitmap(unsafe { (*bitmap).0.clone() }));
     NonNull::from(Box::leak(result))
 }
 
@@ -147,14 +143,11 @@ pub unsafe extern "C" fn sp_bitmap_clone(
 /// The caller has to make sure that:
 ///
 /// - `bitmap` points to a valid [SPBitmap]
-/// - `bitmap` is not used concurrently or after bitmap call
-/// - `bitmap` was not passed to another consuming function, e.g. to create a [SPCommand]
 ///
 /// [SPCommand]: [crate::SPCommand]
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitmap_free(bitmap: *mut SPBitmap) {
+pub unsafe extern "C" fn sp_bitmap_free(bitmap: NonNull<Bitmap>) {
-    assert!(!bitmap.is_null());
+    _ = unsafe { Box::from_raw(bitmap.as_ptr()) };
-    _ = unsafe { Box::from_raw(bitmap) };
 }
 
 /// Gets the current value at the specified position in the [SPBitmap].
@@ -177,12 +170,11 @@ pub unsafe extern "C" fn sp_bitmap_free(bitmap: *mut SPBitmap) {
 /// - `bitmap` is not written to concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitmap_get(
-    bitmap: *const SPBitmap,
+    bitmap: NonNull<Bitmap>,
     x: usize,
     y: usize,
 ) -> bool {
-    assert!(!bitmap.is_null());
+    unsafe { bitmap.as_ref().get(x, y) }
-    unsafe { (*bitmap).0.get(x, y) }
 }
 
 /// Sets the value of the specified position in the [SPBitmap].
@@ -208,13 +200,12 @@ pub unsafe extern "C" fn sp_bitmap_get(
 /// - `bitmap` is not written to or read from concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitmap_set(
-    bitmap: *mut SPBitmap,
+    bitmap: NonNull<Bitmap>,
     x: usize,
     y: usize,
     value: bool,
 ) {
-    assert!(!bitmap.is_null());
+    unsafe { (*bitmap.as_ptr()).set(x, y, value) };
-    unsafe { (*bitmap).0.set(x, y, value) };
 }
 
 /// Sets the state of all pixels in the [SPBitmap].
@@ -235,9 +226,8 @@ pub unsafe extern "C" fn sp_bitmap_set(
 /// - `bitmap` points to a valid [SPBitmap]
 /// - `bitmap` is not written to or read from concurrently
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitmap_fill(bitmap: *mut SPBitmap, value: bool) {
+pub unsafe extern "C" fn sp_bitmap_fill(bitmap: NonNull<Bitmap>, value: bool) {
-    assert!(!bitmap.is_null());
+    unsafe { (*bitmap.as_ptr()).fill(value) };
-    unsafe { (*bitmap).0.fill(value) };
 }
 
 /// Gets the width in pixels of the [SPBitmap] instance.
@@ -256,9 +246,8 @@ pub unsafe extern "C" fn sp_bitmap_fill(bitmap: *mut SPBitmap, value: bool) {
 ///
 /// - `bitmap` points to a valid [SPBitmap]
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitmap_width(bitmap: *const SPBitmap) -> usize {
+pub unsafe extern "C" fn sp_bitmap_width(bitmap: NonNull<Bitmap>) -> usize {
-    assert!(!bitmap.is_null());
+    unsafe { bitmap.as_ref().width() }
-    unsafe { (*bitmap).0.width() }
 }
 
 /// Gets the height in pixels of the [SPBitmap] instance.
@@ -277,9 +266,8 @@ pub unsafe extern "C" fn sp_bitmap_width(bitmap: *const SPBitmap) -> usize {
 ///
 /// - `bitmap` points to a valid [SPBitmap]
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitmap_height(bitmap: *const SPBitmap) -> usize {
+pub unsafe extern "C" fn sp_bitmap_height(bitmap: NonNull<Bitmap>) -> usize {
-    assert!(!bitmap.is_null());
+    unsafe { bitmap.as_ref().height() }
-    unsafe { (*bitmap).0.height() }
 }
 
 /// Gets an unsafe reference to the data of the [SPBitmap] instance.
@@ -297,12 +285,7 @@ pub unsafe extern "C" fn sp_bitmap_height(bitmap: *const SPBitmap) -> usize {
 /// - the returned memory range is never accessed concurrently, either via the [SPBitmap] or directly
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitmap_unsafe_data_ref(
-    bitmap: *mut SPBitmap,
+    mut bitmap: NonNull<Bitmap>,
 ) -> SPByteSlice {
-    assert!(!bitmap.is_null());
+    unsafe { SPByteSlice::from_slice(bitmap.as_mut().data_ref_mut()) }
-    let data = unsafe { (*bitmap).0.data_ref_mut() };
-    SPByteSlice {
-        start: NonNull::new(data.as_mut_ptr_range().start).unwrap(),
-        length: data.len(),
-    }
 }

src/bitvec.rs

@@ -13,19 +13,7 @@ use std::ptr::NonNull;
 /// sp_bitvec_set(vec, 5, true);
 /// sp_bitvec_free(vec);
 /// ```
-pub struct SPBitVec(servicepoint::BitVec);
+pub struct SPBitVec(pub(crate) servicepoint::BitVecU8Msb0);
-
-impl From<servicepoint::BitVec> for SPBitVec {
-    fn from(actual: servicepoint::BitVec) -> Self {
-        Self(actual)
-    }
-}
-
-impl From<SPBitVec> for servicepoint::BitVec {
-    fn from(value: SPBitVec) -> Self {
-        value.0
-    }
-}
 
 impl Clone for SPBitVec {
     fn clone(&self) -> Self {
@@ -53,7 +41,8 @@ impl Clone for SPBitVec {
 ///   by explicitly calling `sp_bitvec_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitvec_new(size: usize) -> NonNull<SPBitVec> {
-    let result = Box::new(SPBitVec(servicepoint::BitVec::repeat(false, size)));
+    let result =
+        Box::new(SPBitVec(servicepoint::BitVecU8Msb0::repeat(false, size)));
     NonNull::from(Box::leak(result))
 }
 
@@ -75,12 +64,11 @@ pub unsafe extern "C" fn sp_bitvec_new(size: usize) -> NonNull<SPBitVec> {
 ///   by explicitly calling `sp_bitvec_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitvec_load(
-    data: *const u8,
+    data: SPByteSlice,
-    data_length: usize,
 ) -> NonNull<SPBitVec> {
-    assert!(!data.is_null());
+    let data = unsafe { data.as_slice() };
-    let data = unsafe { std::slice::from_raw_parts(data, data_length) };
+    let result =
-    let result = Box::new(SPBitVec(servicepoint::BitVec::from_slice(data)));
+        Box::new(SPBitVec(servicepoint::BitVecU8Msb0::from_slice(data)));
     NonNull::from(Box::leak(result))
 }
 
@@ -102,10 +90,9 @@ pub unsafe extern "C" fn sp_bitvec_load(
 ///   by explicitly calling `sp_bitvec_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitvec_clone(
-    bit_vec: *const SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
 ) -> NonNull<SPBitVec> {
-    assert!(!bit_vec.is_null());
+    let result = Box::new(unsafe { bit_vec.as_ref().clone() });
-    let result = Box::new(unsafe { (*bit_vec).clone() });
     NonNull::from(Box::leak(result))
 }
 
@@ -125,9 +112,8 @@ pub unsafe extern "C" fn sp_bitvec_clone(
 ///
 /// [SPCommand]: [crate::SPCommand]
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitvec_free(bit_vec: *mut SPBitVec) {
+pub unsafe extern "C" fn sp_bitvec_free(bit_vec: NonNull<SPBitVec>) {
-    assert!(!bit_vec.is_null());
+    _ = unsafe { Box::from_raw(bit_vec.as_ptr()) };
-    _ = unsafe { Box::from_raw(bit_vec) };
 }
 
 /// Gets the value of a bit from the [SPBitVec].
@@ -152,11 +138,10 @@ pub unsafe extern "C" fn sp_bitvec_free(bit_vec: *mut SPBitVec) {
 /// - `bit_vec` is not written to concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitvec_get(
-    bit_vec: *const SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
     index: usize,
 ) -> bool {
-    assert!(!bit_vec.is_null());
+    unsafe { *bit_vec.as_ref().0.get(index).unwrap() }
-    unsafe { *(*bit_vec).0.get(index).unwrap() }
 }
 
 /// Sets the value of a bit in the [SPBitVec].
@@ -180,12 +165,11 @@ pub unsafe extern "C" fn sp_bitvec_get(
 /// - `bit_vec` is not written to or read from concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitvec_set(
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
     index: usize,
     value: bool,
 ) {
-    assert!(!bit_vec.is_null());
+    unsafe { (*bit_vec.as_ptr()).0.set(index, value) }
-    unsafe { (*bit_vec).0.set(index, value) }
 }
 
 /// Sets the value of all bits in the [SPBitVec].
@@ -206,9 +190,11 @@ pub unsafe extern "C" fn sp_bitvec_set(
 /// - `bit_vec` points to a valid [SPBitVec]
 /// - `bit_vec` is not written to or read from concurrently
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitvec_fill(bit_vec: *mut SPBitVec, value: bool) {
+pub unsafe extern "C" fn sp_bitvec_fill(
-    assert!(!bit_vec.is_null());
+    bit_vec: NonNull<SPBitVec>,
-    unsafe { (*bit_vec).0.fill(value) }
+    value: bool,
+) {
+    unsafe { (*bit_vec.as_ptr()).0.fill(value) }
 }
 
 /// Gets the length of the [SPBitVec] in bits.
@@ -227,9 +213,8 @@ pub unsafe extern "C" fn sp_bitvec_fill(bit_vec: *mut SPBitVec, value: bool) {
 ///
 /// - `bit_vec` points to a valid [SPBitVec]
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitvec_len(bit_vec: *const SPBitVec) -> usize {
+pub unsafe extern "C" fn sp_bitvec_len(bit_vec: NonNull<SPBitVec>) -> usize {
-    assert!(!bit_vec.is_null());
+    unsafe { bit_vec.as_ref().0.len() }
-    unsafe { (*bit_vec).0.len() }
 }
 
 /// Returns true if length is 0.
@@ -248,9 +233,10 @@ pub unsafe extern "C" fn sp_bitvec_len(bit_vec: *const SPBitVec) -> usize {
 ///
 /// - `bit_vec` points to a valid [SPBitVec]
 #[no_mangle]
-pub unsafe extern "C" fn sp_bitvec_is_empty(bit_vec: *const SPBitVec) -> bool {
+pub unsafe extern "C" fn sp_bitvec_is_empty(
-    assert!(!bit_vec.is_null());
+    bit_vec: NonNull<SPBitVec>,
-    unsafe { (*bit_vec).0.is_empty() }
+) -> bool {
+    unsafe { bit_vec.as_ref().0.is_empty() }
 }
 
 /// Gets an unsafe reference to the data of the [SPBitVec] instance.
@@ -272,12 +258,7 @@ pub unsafe extern "C" fn sp_bitvec_is_empty(bit_vec: *const SPBitVec) -> bool {
 /// - the returned memory range is never accessed concurrently, either via the [SPBitVec] or directly
 #[no_mangle]
 pub unsafe extern "C" fn sp_bitvec_unsafe_data_ref(
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
 ) -> SPByteSlice {
-    assert!(!bit_vec.is_null());
+    unsafe { SPByteSlice::from_slice((*bit_vec.as_ptr()).0.as_raw_mut_slice()) }
-    let data = unsafe { (*bit_vec).0.as_raw_mut_slice() };
-    SPByteSlice {
-        start: NonNull::new(data.as_mut_ptr_range().start).unwrap(),
-        length: data.len(),
-    }
 }

src/brightness_grid.rs

@@ -1,9 +1,26 @@
 //! C functions for interacting with [SPBrightnessGrid]s
 //!
 //! prefix `sp_brightness_grid_`
+//!
+//!
+//! A grid containing brightness values.
+//!
+//! # Examples
+//! ```C
+//! SPConnection connection = sp_connection_open("127.0.0.1:2342");
+//! if (connection == NULL)
+//!     return 1;
+//!
+//! SPBrightnessGrid grid = sp_brightness_grid_new(2, 2);
+//! sp_brightness_grid_set(grid, 0, 0, 0);
+//! sp_brightness_grid_set(grid, 1, 1, 10);
+//!
+//! SPCommand command = sp_command_char_brightness(grid);
+//! sp_connection_free(connection);
+//! ```
 
 use crate::SPByteSlice;
-use servicepoint::{DataRef, Grid};
+use servicepoint::{BrightnessGrid, DataRef, Grid};
 use std::convert::Into;
 use std::mem::transmute;
 use std::ptr::NonNull;
@@ -15,24 +32,6 @@ pub const SP_BRIGHTNESS_MAX: u8 = 11;
 /// Count of possible brightness values
 pub const SP_BRIGHTNESS_LEVELS: u8 = 12;
 
-/// A grid containing brightness values.
-///
-/// # Examples
-/// ```C
-/// SPConnection connection = sp_connection_open("127.0.0.1:2342");
-/// if (connection == NULL)
-///     return 1;
-///
-/// SPBrightnessGrid grid = sp_brightness_grid_new(2, 2);
-/// sp_brightness_grid_set(grid, 0, 0, 0);
-/// sp_brightness_grid_set(grid, 1, 1, 10);
-///
-/// SPCommand command = sp_command_char_brightness(grid);
-/// sp_connection_free(connection);
-/// ```
-#[derive(Clone)]
-pub struct SPBrightnessGrid(pub(crate) servicepoint::BrightnessGrid);
-
 /// Creates a new [SPBrightnessGrid] with the specified dimensions.
 ///
 /// returns: [SPBrightnessGrid] initialized to 0. Will never return NULL.
@@ -47,10 +46,8 @@ pub struct SPBrightnessGrid(pub(crate) servicepoint::BrightnessGrid);
 pub unsafe extern "C" fn sp_brightness_grid_new(
     width: usize,
     height: usize,
-) -> NonNull<SPBrightnessGrid> {
+) -> NonNull<BrightnessGrid> {
-    let result = Box::new(SPBrightnessGrid(servicepoint::BrightnessGrid::new(
+    let result = Box::new(BrightnessGrid::new(width, height));
-        width, height,
-    )));
     NonNull::from(Box::leak(result))
 }
 
@@ -75,17 +72,15 @@ pub unsafe extern "C" fn sp_brightness_grid_new(
 pub unsafe extern "C" fn sp_brightness_grid_load(
     width: usize,
     height: usize,
-    data: *const u8,
+    data: SPByteSlice,
-    data_length: usize,
+) -> *mut BrightnessGrid {
-) -> *mut SPBrightnessGrid {
+    let data = unsafe { data.as_slice() };
-    assert!(!data.is_null());
-    let data = unsafe { std::slice::from_raw_parts(data, data_length) };
     let grid = match servicepoint::ByteGrid::load(width, height, data) {
         None => return std::ptr::null_mut(),
         Some(grid) => grid,
     };
-    if let Ok(grid) = servicepoint::BrightnessGrid::try_from(grid) {
+    if let Ok(grid) = BrightnessGrid::try_from(grid) {
-        Box::leak(Box::new(SPBrightnessGrid(grid)))
+        Box::leak(Box::new(grid))
     } else {
         std::ptr::null_mut()
     }
@@ -113,10 +108,9 @@ pub unsafe extern "C" fn sp_brightness_grid_load(
 ///   by explicitly calling `sp_brightness_grid_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_clone(
-    brightness_grid: *const SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
-) -> NonNull<SPBrightnessGrid> {
+) -> NonNull<BrightnessGrid> {
-    assert!(!brightness_grid.is_null());
+    let result = Box::new(unsafe { brightness_grid.as_ref().clone() });
-    let result = Box::new(unsafe { (*brightness_grid).clone() });
     NonNull::from(Box::leak(result))
 }
 
@@ -141,10 +135,9 @@ pub unsafe extern "C" fn sp_brightness_grid_clone(
 /// [SPCommand]: [crate::SPCommand]
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_free(
-    brightness_grid: *mut SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
 ) {
-    assert!(!brightness_grid.is_null());
+    _ = unsafe { Box::from_raw(brightness_grid.as_ptr()) };
-    _ = unsafe { Box::from_raw(brightness_grid) };
 }
 
 /// Gets the current value at the specified position.
@@ -169,12 +162,11 @@ pub unsafe extern "C" fn sp_brightness_grid_free(
 /// - `brightness_grid` is not written to concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_get(
-    brightness_grid: *const SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
     x: usize,
     y: usize,
 ) -> u8 {
-    assert!(!brightness_grid.is_null());
+    unsafe { brightness_grid.as_ref().get(x, y) }.into()
-    unsafe { (*brightness_grid).0.get(x, y) }.into()
 }
 
 /// Sets the value of the specified position in the [SPBrightnessGrid].
@@ -201,15 +193,14 @@ pub unsafe extern "C" fn sp_brightness_grid_get(
 /// - `brightness_grid` is not written to or read from concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_set(
-    brightness_grid: *mut SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
     x: usize,
     y: usize,
     value: u8,
 ) {
-    assert!(!brightness_grid.is_null());
     let brightness = servicepoint::Brightness::try_from(value)
         .expect("invalid brightness value");
-    unsafe { (*brightness_grid).0.set(x, y, brightness) };
+    unsafe { (*brightness_grid.as_ptr()).set(x, y, brightness) };
 }
 
 /// Sets the value of all cells in the [SPBrightnessGrid].
@@ -232,13 +223,12 @@ pub unsafe extern "C" fn sp_brightness_grid_set(
 /// - `brightness_grid` is not written to or read from concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_fill(
-    brightness_grid: *mut SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
     value: u8,
 ) {
-    assert!(!brightness_grid.is_null());
     let brightness = servicepoint::Brightness::try_from(value)
         .expect("invalid brightness value");
-    unsafe { (*brightness_grid).0.fill(brightness) };
+    unsafe { (*brightness_grid.as_ptr()).fill(brightness) };
 }
 
 /// Gets the width of the [SPBrightnessGrid] instance.
@@ -260,10 +250,9 @@ pub unsafe extern "C" fn sp_brightness_grid_fill(
 /// - `brightness_grid` points to a valid [SPBrightnessGrid]
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_width(
-    brightness_grid: *const SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
 ) -> usize {
-    assert!(!brightness_grid.is_null());
+    unsafe { brightness_grid.as_ref().width() }
-    unsafe { (*brightness_grid).0.width() }
 }
 
 /// Gets the height of the [SPBrightnessGrid] instance.
@@ -285,10 +274,9 @@ pub unsafe extern "C" fn sp_brightness_grid_width(
 /// - `brightness_grid` points to a valid [SPBrightnessGrid]
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_height(
-    brightness_grid: *const SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
 ) -> usize {
-    assert!(!brightness_grid.is_null());
+    unsafe { brightness_grid.as_ref().height() }
-    unsafe { (*brightness_grid).0.height() }
 }
 
 /// Gets an unsafe reference to the data of the [SPBrightnessGrid] instance.
@@ -312,15 +300,10 @@ pub unsafe extern "C" fn sp_brightness_grid_height(
 /// - the returned memory range is never accessed concurrently, either via the [SPBrightnessGrid] or directly
 #[no_mangle]
 pub unsafe extern "C" fn sp_brightness_grid_unsafe_data_ref(
-    brightness_grid: *mut SPBrightnessGrid,
+    brightness_grid: NonNull<BrightnessGrid>,
 ) -> SPByteSlice {
-    assert!(!brightness_grid.is_null());
+    assert_eq!(size_of::<servicepoint::Brightness>(), 1);
-    assert_eq!(core::mem::size_of::<servicepoint::Brightness>(), 1);
+    let data = unsafe { (*brightness_grid.as_ptr()).data_ref_mut() };
-    let data = unsafe { (*brightness_grid).0.data_ref_mut() };
     // this assumes more about the memory layout than rust guarantees. yikes!
-    let data: &mut [u8] = unsafe { transmute(data) };
+    unsafe { SPByteSlice::from_slice(transmute(data)) }
-    SPByteSlice {
-        start: NonNull::new(data.as_mut_ptr_range().start).unwrap(),
-        length: data.len(),
-    }
 }

src/byte_slice.rs

@@ -2,7 +2,6 @@
 
 use std::ptr::NonNull;
 
-#[repr(C)]
 /// Represents a span of memory (`&mut [u8]` ) as a struct usable by C code.
 ///
 /// You should not create an instance of this type in your C code.
@@ -16,9 +15,29 @@ use std::ptr::NonNull;
 ///   the function returning this type.
 /// - an instance of this created from C is never passed to a consuming function, as the rust code
 ///   will try to free the memory of a potentially separate allocator.
+#[repr(C)]
 pub struct SPByteSlice {
     /// The start address of the memory
     pub start: NonNull<u8>,
     /// The amount of memory in bytes
     pub length: usize,
 }
+
+impl SPByteSlice {
+    pub(crate) unsafe fn as_slice(&self) -> &[u8] {
+        unsafe { std::slice::from_raw_parts(self.start.as_ptr(), self.length) }
+    }
+
+    pub(crate) unsafe fn as_slice_mut(&self) -> &mut [u8] {
+        unsafe {
+            std::slice::from_raw_parts_mut(self.start.as_ptr(), self.length)
+        }
+    }
+
+    pub(crate) unsafe fn from_slice(slice: &mut [u8]) -> Self {
+        Self {
+            start: NonNull::new(slice.as_mut_ptr()).unwrap(),
+            length: slice.len(),
+        }
+    }
+}

src/char_grid.rs

@@ -1,33 +1,27 @@
 //! C functions for interacting with [SPCharGrid]s
 //!
 //! prefix `sp_char_grid_`
+//!
+//! A C-wrapper for grid containing UTF-8 characters.
+//!
+//! As the rust [char] type is not FFI-safe, characters are passed in their UTF-32 form as 32bit unsigned integers.
+//!
+//! The encoding is enforced in most cases by the rust standard library
+//! and will panic when provided with illegal characters.
+//!
+//! # Examples
+//!
+//! ```C
+//! CharGrid grid = sp_char_grid_new(4, 3);
+//! sp_char_grid_fill(grid, '?');
+//! sp_char_grid_set(grid, 0, 0, '!');
+//! sp_char_grid_free(grid);
+//! ```
 
-use servicepoint::Grid;
+use crate::SPByteSlice;
+use servicepoint::{CharGrid, Grid};
 use std::ptr::NonNull;
 
-/// A C-wrapper for grid containing UTF-8 characters.
-///
-/// As the rust [char] type is not FFI-safe, characters are passed in their UTF-32 form as 32bit unsigned integers.
-///
-/// The encoding is enforced in most cases by the rust standard library
-/// and will panic when provided with illegal characters.
-///
-/// # Examples
-///
-/// ```C
-/// CharGrid grid = sp_char_grid_new(4, 3);
-/// sp_char_grid_fill(grid, '?');
-/// sp_char_grid_set(grid, 0, 0, '!');
-/// sp_char_grid_free(grid);
-/// ```
-pub struct SPCharGrid(pub(crate) servicepoint::CharGrid);
-
-impl Clone for SPCharGrid {
-    fn clone(&self) -> Self {
-        SPCharGrid(self.0.clone())
-    }
-}
-
 /// Creates a new [SPCharGrid] with the specified dimensions.
 ///
 /// returns: [SPCharGrid] initialized to 0. Will never return NULL.
@@ -42,9 +36,8 @@ impl Clone for SPCharGrid {
 pub unsafe extern "C" fn sp_char_grid_new(
     width: usize,
     height: usize,
-) -> NonNull<SPCharGrid> {
+) -> NonNull<CharGrid> {
-    let result =
+    let result = Box::new(CharGrid::new(width, height));
-        Box::new(SPCharGrid(servicepoint::CharGrid::new(width, height)));
     NonNull::from(Box::leak(result))
 }
 
@@ -70,15 +63,12 @@ pub unsafe extern "C" fn sp_char_grid_new(
 pub unsafe extern "C" fn sp_char_grid_load(
     width: usize,
     height: usize,
-    data: *const u8,
+    data: SPByteSlice,
-    data_length: usize,
+) -> NonNull<CharGrid> {
-) -> NonNull<SPCharGrid> {
+    let data = unsafe { data.as_slice() };
-    assert!(data.is_null());
+    // TODO remove unwrap
-    let data = unsafe { std::slice::from_raw_parts(data, data_length) };
+    let result =
-    let result = Box::new(SPCharGrid(
+        Box::new(CharGrid::load_utf8(width, height, data.to_vec()).unwrap());
-        servicepoint::CharGrid::load_utf8(width, height, data.to_vec())
-            .unwrap(),
-    ));
     NonNull::from(Box::leak(result))
 }
 
@@ -100,10 +90,9 @@ pub unsafe extern "C" fn sp_char_grid_load(
 ///   by explicitly calling `sp_char_grid_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_char_grid_clone(
-    char_grid: *const SPCharGrid,
+    char_grid: NonNull<CharGrid>,
-) -> NonNull<SPCharGrid> {
+) -> NonNull<CharGrid> {
-    assert!(!char_grid.is_null());
+    let result = Box::new(unsafe { char_grid.as_ref().clone() });
-    let result = Box::new(unsafe { (*char_grid).clone() });
     NonNull::from(Box::leak(result))
 }
 
@@ -123,9 +112,8 @@ pub unsafe extern "C" fn sp_char_grid_clone(
 ///
 /// [SPCommand]: [crate::SPCommand]
 #[no_mangle]
-pub unsafe extern "C" fn sp_char_grid_free(char_grid: *mut SPCharGrid) {
+pub unsafe extern "C" fn sp_char_grid_free(char_grid: NonNull<CharGrid>) {
-    assert!(!char_grid.is_null());
+    _ = unsafe { Box::from_raw(char_grid.as_ptr()) };
-    _ = unsafe { Box::from_raw(char_grid) };
 }
 
 /// Gets the current value at the specified position.
@@ -148,12 +136,11 @@ pub unsafe extern "C" fn sp_char_grid_free(char_grid: *mut SPCharGrid) {
 /// - `char_grid` is not written to concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_char_grid_get(
-    char_grid: *const SPCharGrid,
+    char_grid: NonNull<CharGrid>,
     x: usize,
     y: usize,
 ) -> u32 {
-    assert!(!char_grid.is_null());
+    unsafe { char_grid.as_ref().get(x, y) as u32 }
-    unsafe { (*char_grid).0.get(x, y) as u32 }
 }
 
 /// Sets the value of the specified position in the [SPCharGrid].
@@ -181,13 +168,12 @@ pub unsafe extern "C" fn sp_char_grid_get(
 /// [SPBitVec]: [crate::SPBitVec]
 #[no_mangle]
 pub unsafe extern "C" fn sp_char_grid_set(
-    char_grid: *mut SPCharGrid,
+    char_grid: NonNull<CharGrid>,
     x: usize,
     y: usize,
     value: u32,
 ) {
-    assert!(!char_grid.is_null());
+    unsafe { (*char_grid.as_ptr()).set(x, y, char::from_u32(value).unwrap()) };
-    unsafe { (*char_grid).0.set(x, y, char::from_u32(value).unwrap()) };
 }
 
 /// Sets the value of all cells in the [SPCharGrid].
@@ -209,11 +195,10 @@ pub unsafe extern "C" fn sp_char_grid_set(
 /// - `char_grid` is not written to or read from concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_char_grid_fill(
-    char_grid: *mut SPCharGrid,
+    char_grid: NonNull<CharGrid>,
     value: u32,
 ) {
-    assert!(!char_grid.is_null());
+    unsafe { (*char_grid.as_ptr()).fill(char::from_u32(value).unwrap()) };
-    unsafe { (*char_grid).0.fill(char::from_u32(value).unwrap()) };
 }
 
 /// Gets the width of the [SPCharGrid] instance.
@@ -233,10 +218,9 @@ pub unsafe extern "C" fn sp_char_grid_fill(
 /// - `char_grid` points to a valid [SPCharGrid]
 #[no_mangle]
 pub unsafe extern "C" fn sp_char_grid_width(
-    char_grid: *const SPCharGrid,
+    char_grid: NonNull<CharGrid>,
 ) -> usize {
-    assert!(!char_grid.is_null());
+    unsafe { char_grid.as_ref().width() }
-    unsafe { (*char_grid).0.width() }
 }
 
 /// Gets the height of the [SPCharGrid] instance.
@@ -256,8 +240,7 @@ pub unsafe extern "C" fn sp_char_grid_width(
 /// - `char_grid` points to a valid [SPCharGrid]
 #[no_mangle]
 pub unsafe extern "C" fn sp_char_grid_height(
-    char_grid: *const SPCharGrid,
+    char_grid: NonNull<CharGrid>,
 ) -> usize {
-    assert!(!char_grid.is_null());
+    unsafe { char_grid.as_ref().height() }
-    unsafe { (*char_grid).0.height() }
 }

src/command.rs

@@ -2,11 +2,11 @@
 //!
 //! prefix `sp_command_`
 
-use crate::{
+use crate::SPBitVec;
-    SPBitVec, SPBitmap, SPBrightnessGrid, SPCharGrid, SPCompressionCode,
+use servicepoint::{
-    SPCp437Grid, SPPacket,
+    BinaryOperation, Bitmap, BrightnessGrid, CharGrid, CompressionCode,
+    Cp437Grid, GlobalBrightnessCommand, Packet, TypedCommand,
 };
-use servicepoint::{BinaryOperation, GlobalBrightnessCommand};
 use std::ptr::NonNull;
 
 /// A low-level display command.
@@ -23,13 +23,6 @@ use std::ptr::NonNull;
 /// ```
 ///
 /// [SPConnection]: [crate::SPConnection]
-pub struct SPCommand(pub(crate) servicepoint::TypedCommand);
-
-impl Clone for SPCommand {
-    fn clone(&self) -> Self {
-        SPCommand(self.0.clone())
-    }
-}
 
 /// Tries to turn a [SPPacket] into a [SPCommand].
 ///
@@ -52,12 +45,12 @@ impl Clone for SPCommand {
 ///   by explicitly calling `sp_command_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_try_from_packet(
-    packet: *mut SPPacket,
+    packet: NonNull<Packet>,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
-    let packet = *unsafe { Box::from_raw(packet) };
+    let packet = *unsafe { Box::from_raw(packet.as_ptr()) };
-    match servicepoint::TypedCommand::try_from(packet.0) {
+    match servicepoint::TypedCommand::try_from(packet) {
         Err(_) => std::ptr::null_mut(),
-        Ok(command) => Box::into_raw(Box::new(SPCommand(command))),
+        Ok(command) => Box::into_raw(Box::new(command)),
     }
 }
 
@@ -79,10 +72,9 @@ pub unsafe extern "C" fn sp_command_try_from_packet(
 ///   by explicitly calling `sp_command_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_clone(
-    command: *const SPCommand,
+    command: NonNull<TypedCommand>,
-) -> NonNull<SPCommand> {
+) -> NonNull<TypedCommand> {
-    assert!(!command.is_null());
+    let result = Box::new(unsafe { command.as_ref().clone() });
-    let result = Box::new(unsafe { (*command).clone() });
     NonNull::from(Box::leak(result))
 }
 
@@ -105,8 +97,8 @@ pub unsafe extern "C" fn sp_command_clone(
 /// - the returned [SPCommand] instance is freed in some way, either by using a consuming function or
 ///   by explicitly calling `sp_command_free`.
 #[no_mangle]
-pub unsafe extern "C" fn sp_command_clear() -> NonNull<SPCommand> {
+pub unsafe extern "C" fn sp_command_clear() -> NonNull<TypedCommand> {
-    let result = Box::new(SPCommand(servicepoint::ClearCommand.into()));
+    let result = Box::new(servicepoint::ClearCommand.into());
     NonNull::from(Box::leak(result))
 }
 
@@ -123,8 +115,8 @@ pub unsafe extern "C" fn sp_command_clear() -> NonNull<SPCommand> {
 /// - the returned [SPCommand] instance is freed in some way, either by using a consuming function or
 ///   by explicitly calling `sp_command_free`.
 #[no_mangle]
-pub unsafe extern "C" fn sp_command_hard_reset() -> NonNull<SPCommand> {
+pub unsafe extern "C" fn sp_command_hard_reset() -> NonNull<TypedCommand> {
-    let result = Box::new(SPCommand(servicepoint::HardResetCommand.into()));
+    let result = Box::new(servicepoint::HardResetCommand.into());
     NonNull::from(Box::leak(result))
 }
 
@@ -139,8 +131,8 @@ pub unsafe extern "C" fn sp_command_hard_reset() -> NonNull<SPCommand> {
 /// - the returned [SPCommand] instance is freed in some way, either by using a consuming function or
 ///   by explicitly calling `sp_command_free`.
 #[no_mangle]
-pub unsafe extern "C" fn sp_command_fade_out() -> NonNull<SPCommand> {
+pub unsafe extern "C" fn sp_command_fade_out() -> NonNull<TypedCommand> {
-    let result = Box::new(SPCommand(servicepoint::FadeOutCommand.into()));
+    let result = Box::new(servicepoint::FadeOutCommand.into());
     NonNull::from(Box::leak(result))
 }
 
@@ -161,11 +153,10 @@ pub unsafe extern "C" fn sp_command_fade_out() -> NonNull<SPCommand> {
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_brightness(
     brightness: u8,
-) -> NonNull<SPCommand> {
+) -> NonNull<TypedCommand> {
     let brightness = servicepoint::Brightness::try_from(brightness)
         .expect("invalid brightness");
-    let result =
+    let result = Box::new(GlobalBrightnessCommand::from(brightness).into());
-        Box::new(SPCommand(GlobalBrightnessCommand::from(brightness).into()));
     NonNull::from(Box::leak(result))
 }
 
@@ -191,17 +182,16 @@ pub unsafe extern "C" fn sp_command_brightness(
 pub unsafe extern "C" fn sp_command_char_brightness(
     x: usize,
     y: usize,
-    grid: *mut SPBrightnessGrid,
+    grid: NonNull<BrightnessGrid>,
-) -> NonNull<SPCommand> {
+) -> NonNull<TypedCommand> {
-    assert!(!grid.is_null());
+    let grid = unsafe { *Box::from_raw(grid.as_ptr()) };
-    let byte_grid = unsafe { *Box::from_raw(grid) };
+    let result = Box::new(
-    let result = Box::new(SPCommand(
         servicepoint::BrightnessGridCommand {
             origin: servicepoint::Origin::new(x, y),
-            grid: byte_grid.0,
+            grid,
         }
         .into(),
-    ));
+    );
     NonNull::from(Box::leak(result))
 }
 
@@ -233,9 +223,9 @@ pub unsafe extern "C" fn sp_command_char_brightness(
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_bitmap_linear(
     offset: usize,
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
-    compression: SPCompressionCode,
+    compression: CompressionCode,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
     unsafe {
         sp_command_bitmap_linear_internal(
             offset,
@@ -274,9 +264,9 @@ pub unsafe extern "C" fn sp_command_bitmap_linear(
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_bitmap_linear_and(
     offset: usize,
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
-    compression: SPCompressionCode,
+    compression: CompressionCode,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
     unsafe {
         sp_command_bitmap_linear_internal(
             offset,
@@ -315,9 +305,9 @@ pub unsafe extern "C" fn sp_command_bitmap_linear_and(
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_bitmap_linear_or(
     offset: usize,
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
-    compression: SPCompressionCode,
+    compression: CompressionCode,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
     unsafe {
         sp_command_bitmap_linear_internal(
             offset,
@@ -356,9 +346,9 @@ pub unsafe extern "C" fn sp_command_bitmap_linear_or(
 #[no_mangle]
 pub unsafe extern "C" fn sp_command_bitmap_linear_xor(
     offset: usize,
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
-    compression: SPCompressionCode,
+    compression: CompressionCode,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
     unsafe {
         sp_command_bitmap_linear_internal(
             offset,
@@ -372,25 +362,22 @@ pub unsafe extern "C" fn sp_command_bitmap_linear_xor(
 #[inline]
 unsafe fn sp_command_bitmap_linear_internal(
     offset: usize,
-    bit_vec: *mut SPBitVec,
+    bit_vec: NonNull<SPBitVec>,
-    compression: SPCompressionCode,
+    compression: CompressionCode,
     operation: BinaryOperation,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
-    assert!(!bit_vec.is_null());
+    let bit_vec = unsafe { *Box::from_raw(bit_vec.as_ptr()) };
-    let bit_vec = unsafe { *Box::from_raw(bit_vec) };
     let compression = match compression.try_into() {
         Ok(compression) => compression,
         Err(_) => return std::ptr::null_mut(),
     };
-    let command = SPCommand(
+    let command = servicepoint::BitVecCommand {
-        servicepoint::BitVecCommand {
+        offset,
-            offset,
+        operation,
-            operation,
+        bitvec: bit_vec.0,
-            bitvec: bit_vec.into(),
+        compression,
-            compression,
+    }
-        }
+    .into();
-        .into(),
-    );
     Box::leak(Box::new(command))
 }
 
@@ -416,17 +403,16 @@ unsafe fn sp_command_bitmap_linear_internal(
 pub unsafe extern "C" fn sp_command_cp437_data(
     x: usize,
     y: usize,
-    grid: *mut SPCp437Grid,
+    grid: NonNull<Cp437Grid>,
-) -> NonNull<SPCommand> {
+) -> NonNull<TypedCommand> {
-    assert!(!grid.is_null());
+    let grid = *unsafe { Box::from_raw(grid.as_ptr()) };
-    let grid = *unsafe { Box::from_raw(grid) };
+    let result = Box::new(
-    let result = Box::new(SPCommand(
         servicepoint::Cp437GridCommand {
             origin: servicepoint::Origin::new(x, y),
-            grid: grid.0,
+            grid,
         }
         .into(),
-    ));
+    );
     NonNull::from(Box::leak(result))
 }
 
@@ -452,17 +438,16 @@ pub unsafe extern "C" fn sp_command_cp437_data(
 pub unsafe extern "C" fn sp_command_utf8_data(
     x: usize,
     y: usize,
-    grid: *mut SPCharGrid,
+    grid: NonNull<CharGrid>,
-) -> NonNull<SPCommand> {
+) -> NonNull<TypedCommand> {
-    assert!(!grid.is_null());
+    let grid = unsafe { *Box::from_raw(grid.as_ptr()) };
-    let grid = unsafe { *Box::from_raw(grid) };
+    let result = Box::new(
-    let result = Box::new(SPCommand(
         servicepoint::CharGridCommand {
             origin: servicepoint::Origin::new(x, y),
-            grid: grid.0,
+            grid,
         }
         .into(),
-    ));
+    );
     NonNull::from(Box::leak(result))
 }
 
@@ -490,23 +475,20 @@ pub unsafe extern "C" fn sp_command_utf8_data(
 pub unsafe extern "C" fn sp_command_bitmap_linear_win(
     x: usize,
     y: usize,
-    bitmap: *mut SPBitmap,
+    bitmap: NonNull<Bitmap>,
-    compression: SPCompressionCode,
+    compression: CompressionCode,
-) -> *mut SPCommand {
+) -> *mut TypedCommand {
-    assert!(!bitmap.is_null());
+    let bitmap = unsafe { *Box::from_raw(bitmap.as_ptr()) };
-    let bitmap = unsafe { *Box::from_raw(bitmap) }.0;
     let compression = match compression.try_into() {
         Ok(compression) => compression,
         Err(_) => return std::ptr::null_mut(),
     };
-    let command = SPCommand(
+    let command = servicepoint::BitmapCommand {
-        servicepoint::BitmapCommand {
+        origin: servicepoint::Origin::new(x, y),
-            origin: servicepoint::Origin::new(x, y),
+        bitmap,
-            bitmap,
+        compression,
-            compression,
+    }
-        }
+    .into();
-        .into(),
-    );
     Box::leak(Box::new(command))
 }
 
@@ -531,7 +513,6 @@ pub unsafe extern "C" fn sp_command_bitmap_linear_win(
 /// - `command` is not used concurrently or after this call
 /// - `command` was not passed to another consuming function, e.g. to create a [SPPacket]
 #[no_mangle]
-pub unsafe extern "C" fn sp_command_free(command: *mut SPCommand) {
+pub unsafe extern "C" fn sp_command_free(command: NonNull<TypedCommand>) {
-    assert!(!command.is_null());
+    _ = unsafe { Box::from_raw(command.as_ptr()) };
-    _ = unsafe { Box::from_raw(command) };
 }

src/connection.rs

@@ -1,21 +1,20 @@
 //! C functions for interacting with [SPConnection]s
 //!
 //! prefix `sp_connection_`
+//!
+//! A connection to the display.
+//!
+//! # Examples
+//!
+//! ```C
+//! CConnection connection = sp_connection_open("172.23.42.29:2342");
+//! if (connection != NULL)
+//!     sp_connection_send_command(connection, sp_command_clear());
+//! ```
 
-use crate::{SPCommand, SPPacket};
+use servicepoint::{Connection, Packet, TypedCommand, UdpConnection};
-use servicepoint::Connection;
 use std::ffi::{c_char, CStr};
-
+use std::ptr::NonNull;
-/// A connection to the display.
-///
-/// # Examples
-///
-/// ```C
-/// CConnection connection = sp_connection_open("172.23.42.29:2342");
-/// if (connection != NULL)
-///     sp_connection_send_command(connection, sp_command_clear());
-/// ```
-pub struct SPConnection(pub(crate) servicepoint::UdpConnection);
 
 /// Creates a new instance of [SPConnection].
 ///
@@ -33,20 +32,31 @@ pub struct SPConnection(pub(crate) servicepoint::UdpConnection);
 ///   by explicitly calling `sp_connection_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_connection_open(
-    host: *const c_char,
+    host: NonNull<c_char>,
-) -> *mut SPConnection {
+) -> *mut UdpConnection {
-    assert!(!host.is_null());
+    let host = unsafe { CStr::from_ptr(host.as_ptr()) }
-    let host = unsafe { CStr::from_ptr(host) }
         .to_str()
         .expect("Bad encoding");
-    let connection = match servicepoint::UdpConnection::open(host) {
+    let connection = match UdpConnection::open(host) {
         Err(_) => return std::ptr::null_mut(),
         Ok(value) => value,
     };
 
-    Box::into_raw(Box::new(SPConnection(connection)))
+    Box::into_raw(Box::new(connection))
 }
 
+//#[no_mangle]
+//pub unsafe extern "C" fn sp_connection_open_ipv4(
+//    host: SocketAddrV4,
+//) -> *mut SPConnection {
+//    let connection = match servicepoint::UdpConnection::open(host) {
+//        Err(_) => return std::ptr::null_mut(),
+//        Ok(value) => value,
+//    };
+//
+//    Box::into_raw(Box::new(SPConnection(connection)))
+//}
+
 // /// Creates a new instance of [SPUdpConnection] for testing that does not actually send anything.
 // ///
 // /// returns: a new instance. Will never return NULL.
@@ -83,13 +93,11 @@ pub unsafe extern "C" fn sp_connection_open(
 /// - `packet` is not used concurrently or after this call
 #[no_mangle]
 pub unsafe extern "C" fn sp_connection_send_packet(
-    connection: *const SPConnection,
+    connection: NonNull<UdpConnection>,
-    packet: *mut SPPacket,
+    packet: NonNull<Packet>,
 ) -> bool {
-    assert!(!connection.is_null());
+    let packet = unsafe { Box::from_raw(packet.as_ptr()) };
-    assert!(!packet.is_null());
+    unsafe { connection.as_ref().send(*packet) }.is_ok()
-    let packet = unsafe { Box::from_raw(packet) };
-    unsafe { (*connection).0.send((*packet).0) }.is_ok()
 }
 
 /// Sends a [SPCommand] to the display using the [SPConnection].
@@ -112,13 +120,11 @@ pub unsafe extern "C" fn sp_connection_send_packet(
 /// - `command` is not used concurrently or after this call
 #[no_mangle]
 pub unsafe extern "C" fn sp_connection_send_command(
-    connection: *const SPConnection,
+    connection: NonNull<UdpConnection>,
-    command: *mut SPCommand,
+    command: NonNull<TypedCommand>,
 ) -> bool {
-    assert!(!connection.is_null());
+    let command = *unsafe { Box::from_raw(command.as_ptr()) };
-    assert!(!command.is_null());
+    unsafe { connection.as_ref().send(command) }.is_ok()
-    let command = (*unsafe { Box::from_raw(command) }).0;
-    unsafe { (*connection).0.send(command) }.is_ok()
 }
 
 /// Closes and deallocates a [SPConnection].
@@ -134,7 +140,8 @@ pub unsafe extern "C" fn sp_connection_send_command(
 /// - `connection` points to a valid [SPConnection]
 /// - `connection` is not used concurrently or after this call
 #[no_mangle]
-pub unsafe extern "C" fn sp_connection_free(connection: *mut SPConnection) {
+pub unsafe extern "C" fn sp_connection_free(
-    assert!(!connection.is_null());
+    connection: NonNull<UdpConnection>,
-    _ = unsafe { Box::from_raw(connection) };
+) {
+    _ = unsafe { Box::from_raw(connection.as_ptr()) };
 }

src/constants.rs

@@ -1,48 +0,0 @@
-//! re-exported constants for use in C
-
-use servicepoint::CompressionCode;
-use std::time::Duration;
-
-/// size of a single tile in one dimension
-pub const SP_TILE_SIZE: usize = 8;
-
-/// Display tile count in the x-direction
-pub const SP_TILE_WIDTH: usize = 56;
-
-/// Display tile count in the y-direction
-pub const SP_TILE_HEIGHT: usize = 20;
-
-/// Display width in pixels
-pub const SP_PIXEL_WIDTH: usize = SP_TILE_WIDTH * SP_TILE_SIZE;
-
-/// Display height in pixels
-pub const SP_PIXEL_HEIGHT: usize = SP_TILE_HEIGHT * SP_TILE_SIZE;
-
-/// pixel count on whole screen
-pub const SP_PIXEL_COUNT: usize = SP_PIXEL_WIDTH * SP_PIXEL_HEIGHT;
-
-/// Actual hardware limit is around 28-29ms/frame. Rounded up for less dropped packets.
-pub const SP_FRAME_PACING_MS: u128 = Duration::from_millis(30).as_millis();
-
-/// Specifies the kind of compression to use.
-#[repr(u16)]
-pub enum SPCompressionCode {
-    /// no compression
-    Uncompressed = 0x0,
-    /// compress using flate2 with zlib header
-    Zlib = 0x677a,
-    /// compress using bzip2
-    Bzip2 = 0x627a,
-    /// compress using lzma
-    Lzma = 0x6c7a,
-    /// compress using Zstandard
-    Zstd = 0x7a73,
-}
-
-impl TryFrom<SPCompressionCode> for CompressionCode {
-    type Error = ();
-
-    fn try_from(value: SPCompressionCode) -> Result<Self, Self::Error> {
-        CompressionCode::try_from(value as u16).map_err(|_| ())
-    }
-}

src/cp437_grid.rs

@@ -1,31 +1,25 @@
 //! C functions for interacting with [SPCp437Grid]s
 //!
 //! prefix `sp_cp437_grid_`
+//!
+//!
+//! A C-wrapper for grid containing codepage 437 characters.
+//!
+//! The encoding is currently not enforced.
+//!
+//! # Examples
+//!
+//! ```C
+//! Cp437Grid grid = sp_cp437_grid_new(4, 3);
+//! sp_cp437_grid_fill(grid, '?');
+//! sp_cp437_grid_set(grid, 0, 0, '!');
+//! sp_cp437_grid_free(grid);
+//! ```
 
 use crate::SPByteSlice;
-use servicepoint::{DataRef, Grid};
+use servicepoint::{Cp437Grid, DataRef, Grid};
 use std::ptr::NonNull;
 
-/// A C-wrapper for grid containing codepage 437 characters.
-///
-/// The encoding is currently not enforced.
-///
-/// # Examples
-///
-/// ```C
-/// Cp437Grid grid = sp_cp437_grid_new(4, 3);
-/// sp_cp437_grid_fill(grid, '?');
-/// sp_cp437_grid_set(grid, 0, 0, '!');
-/// sp_cp437_grid_free(grid);
-/// ```
-pub struct SPCp437Grid(pub(crate) servicepoint::Cp437Grid);
-
-impl Clone for SPCp437Grid {
-    fn clone(&self) -> Self {
-        SPCp437Grid(self.0.clone())
-    }
-}
-
 /// Creates a new [SPCp437Grid] with the specified dimensions.
 ///
 /// returns: [SPCp437Grid] initialized to 0. Will never return NULL.
@@ -40,9 +34,8 @@ impl Clone for SPCp437Grid {
 pub unsafe extern "C" fn sp_cp437_grid_new(
     width: usize,
     height: usize,
-) -> NonNull<SPCp437Grid> {
+) -> NonNull<Cp437Grid> {
-    let result =
+    let result = Box::new(Cp437Grid::new(width, height));
-        Box::new(SPCp437Grid(servicepoint::Cp437Grid::new(width, height)));
     NonNull::from(Box::leak(result))
 }
 
@@ -67,14 +60,12 @@ pub unsafe extern "C" fn sp_cp437_grid_new(
 pub unsafe extern "C" fn sp_cp437_grid_load(
     width: usize,
     height: usize,
-    data: *const u8,
+    data: SPByteSlice,
-    data_length: usize,
+) -> *mut Cp437Grid {
-) -> *mut SPCp437Grid {
+    let data = unsafe { data.as_slice() };
-    assert!(data.is_null());
+    let grid = Cp437Grid::load(width, height, data);
-    let data = unsafe { std::slice::from_raw_parts(data, data_length) };
-    let grid = servicepoint::Cp437Grid::load(width, height, data);
     if let Some(grid) = grid {
-        Box::leak(Box::new(SPCp437Grid(grid)))
+        Box::leak(Box::new(grid))
     } else {
         std::ptr::null_mut()
     }
@@ -98,10 +89,9 @@ pub unsafe extern "C" fn sp_cp437_grid_load(
 ///   by explicitly calling `sp_cp437_grid_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_clone(
-    cp437_grid: *const SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
-) -> NonNull<SPCp437Grid> {
+) -> NonNull<Cp437Grid> {
-    assert!(!cp437_grid.is_null());
+    let result = Box::new(unsafe { cp437_grid.as_ref().clone() });
-    let result = Box::new(unsafe { (*cp437_grid).clone() });
     NonNull::from(Box::leak(result))
 }
 
@@ -121,9 +111,8 @@ pub unsafe extern "C" fn sp_cp437_grid_clone(
 ///
 /// [SPCommand]: [crate::SPCommand]
 #[no_mangle]
-pub unsafe extern "C" fn sp_cp437_grid_free(cp437_grid: *mut SPCp437Grid) {
+pub unsafe extern "C" fn sp_cp437_grid_free(cp437_grid: NonNull<Cp437Grid>) {
-    assert!(!cp437_grid.is_null());
+    _ = unsafe { Box::from_raw(cp437_grid.as_ptr()) };
-    _ = unsafe { Box::from_raw(cp437_grid) };
 }
 
 /// Gets the current value at the specified position.
@@ -146,12 +135,11 @@ pub unsafe extern "C" fn sp_cp437_grid_free(cp437_grid: *mut SPCp437Grid) {
 /// - `cp437_grid` is not written to concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_get(
-    cp437_grid: *const SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
     x: usize,
     y: usize,
 ) -> u8 {
-    assert!(!cp437_grid.is_null());
+    unsafe { cp437_grid.as_ref().get(x, y) }
-    unsafe { (*cp437_grid).0.get(x, y) }
 }
 
 /// Sets the value of the specified position in the [SPCp437Grid].
@@ -179,13 +167,12 @@ pub unsafe extern "C" fn sp_cp437_grid_get(
 /// [SPBitVec]: [crate::SPBitVec]
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_set(
-    cp437_grid: *mut SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
     x: usize,
     y: usize,
     value: u8,
 ) {
-    assert!(!cp437_grid.is_null());
+    unsafe { (*cp437_grid.as_ptr()).set(x, y, value) };
-    unsafe { (*cp437_grid).0.set(x, y, value) };
 }
 
 /// Sets the value of all cells in the [SPCp437Grid].
@@ -207,11 +194,10 @@ pub unsafe extern "C" fn sp_cp437_grid_set(
 /// - `cp437_grid` is not written to or read from concurrently
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_fill(
-    cp437_grid: *mut SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
     value: u8,
 ) {
-    assert!(!cp437_grid.is_null());
+    unsafe { (*cp437_grid.as_ptr()).fill(value) };
-    unsafe { (*cp437_grid).0.fill(value) };
 }
 
 /// Gets the width of the [SPCp437Grid] instance.
@@ -231,10 +217,9 @@ pub unsafe extern "C" fn sp_cp437_grid_fill(
 /// - `cp437_grid` points to a valid [SPCp437Grid]
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_width(
-    cp437_grid: *const SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
 ) -> usize {
-    assert!(!cp437_grid.is_null());
+    unsafe { cp437_grid.as_ref().width() }
-    unsafe { (*cp437_grid).0.width() }
 }
 
 /// Gets the height of the [SPCp437Grid] instance.
@@ -254,10 +239,9 @@ pub unsafe extern "C" fn sp_cp437_grid_width(
 /// - `cp437_grid` points to a valid [SPCp437Grid]
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_height(
-    cp437_grid: *const SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
 ) -> usize {
-    assert!(!cp437_grid.is_null());
+    unsafe { cp437_grid.as_ref().height() }
-    unsafe { (*cp437_grid).0.height() }
 }
 
 /// Gets an unsafe reference to the data of the [SPCp437Grid] instance.
@@ -277,11 +261,7 @@ pub unsafe extern "C" fn sp_cp437_grid_height(
 /// - the returned memory range is never accessed concurrently, either via the [SPCp437Grid] or directly
 #[no_mangle]
 pub unsafe extern "C" fn sp_cp437_grid_unsafe_data_ref(
-    cp437_grid: *mut SPCp437Grid,
+    cp437_grid: NonNull<Cp437Grid>,
 ) -> SPByteSlice {
-    let data = unsafe { (*cp437_grid).0.data_ref_mut() };
+    unsafe { SPByteSlice::from_slice((*cp437_grid.as_ptr()).data_ref_mut()) }
-    SPByteSlice {
-        start: NonNull::new(data.as_mut_ptr_range().start).unwrap(),
-        length: data.len(),
-    }
 }

src/lib.rs

@@ -32,7 +32,6 @@ pub use crate::byte_slice::*;
 pub use crate::char_grid::*;
 pub use crate::command::*;
 pub use crate::connection::*;
-pub use crate::constants::*;
 pub use crate::cp437_grid::*;
 pub use crate::packet::*;
 
@@ -43,6 +42,10 @@ mod byte_slice;
 mod char_grid;
 mod command;
 mod connection;
-mod constants;
 mod cp437_grid;
 mod packet;
+
+use std::time::Duration;
+
+/// Actual hardware limit is around 28-29ms/frame. Rounded up for less dropped packets.
+pub const SP_FRAME_PACING_MS: u128 = Duration::from_millis(30).as_millis();

src/packet.rs

@@ -1,14 +1,14 @@
 //! C functions for interacting with [SPPacket]s
 //!
 //! prefix `sp_packet_`
+//!
+//!
+//! The raw packet
 
+use crate::SPByteSlice;
+use servicepoint::{Header, Packet, TypedCommand};
 use std::ptr::NonNull;
 
-use crate::SPCommand;
-
-/// The raw packet
-pub struct SPPacket(pub(crate) servicepoint::Packet);
-
 /// Turns a [SPCommand] into a [SPPacket].
 /// The [SPCommand] gets consumed.
 ///
@@ -28,12 +28,11 @@ pub struct SPPacket(pub(crate) servicepoint::Packet);
 ///   by explicitly calling `sp_packet_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_packet_from_command(
-    command: *mut SPCommand,
+    command: NonNull<TypedCommand>,
-) -> *mut SPPacket {
+) -> *mut Packet {
-    assert!(!command.is_null());
+    let command = unsafe { *Box::from_raw(command.as_ptr()) };
-    let command = unsafe { *Box::from_raw(command) };
+    if let Ok(packet) = command.try_into() {
-    if let Ok(packet) = command.0.try_into() {
+        Box::leak(Box::new(packet))
-        Box::leak(Box::new(SPPacket(packet)))
     } else {
         std::ptr::null_mut()
     }
@@ -56,15 +55,11 @@ pub unsafe extern "C" fn sp_packet_from_command(
 /// - the returned [SPPacket] instance is freed in some way, either by using a consuming function or
 ///   by explicitly calling `sp_packet_free`.
 #[no_mangle]
-pub unsafe extern "C" fn sp_packet_try_load(
+pub unsafe extern "C" fn sp_packet_try_load(data: SPByteSlice) -> *mut Packet {
-    data: *const u8,
+    let data = unsafe { data.as_slice() };
-    length: usize,
-) -> *mut SPPacket {
-    assert!(!data.is_null());
-    let data = unsafe { std::slice::from_raw_parts(data, length) };
     match servicepoint::Packet::try_from(data) {
         Err(_) => std::ptr::null_mut(),
-        Ok(packet) => Box::into_raw(Box::new(SPPacket(packet))),
+        Ok(packet) => Box::into_raw(Box::new(packet)),
     }
 }
 
@@ -94,36 +89,50 @@ pub unsafe extern "C" fn sp_packet_try_load(
 ///   by explicitly calling [sp_packet_free].
 #[no_mangle]
 pub unsafe extern "C" fn sp_packet_from_parts(
-    command_code: u16,
+    header: Header,
-    a: u16,
+    payload: *const SPByteSlice,
-    b: u16,
+) -> NonNull<Packet> {
-    c: u16,
-    d: u16,
-    payload: *const u8,
-    payload_len: usize,
-) -> NonNull<SPPacket> {
-    assert_eq!(payload.is_null(), payload_len == 0);
-
     let payload = if payload.is_null() {
         vec![]
     } else {
-        let payload =
+        let payload = unsafe { (*payload).as_slice() };
-            unsafe { std::slice::from_raw_parts(payload, payload_len) };
         Vec::from(payload)
     };
 
-    let packet = servicepoint::Packet {
+    let packet = Box::new(Packet { header, payload });
-        header: servicepoint::Header {
+    NonNull::from(Box::leak(packet))
-            command_code,
+}
-            a,
+
-            b,
+#[no_mangle]
-            c,
+pub unsafe extern "C" fn sp_packet_get_header(
-            d,
+    packet: NonNull<Packet>,
-        },
+) -> NonNull<Header> {
-        payload,
+    NonNull::from(&mut unsafe { (*packet.as_ptr()).header })
-    };
+}
-    let result = Box::new(SPPacket(packet));
+
-    NonNull::from(Box::leak(result))
+#[no_mangle]
+pub unsafe extern "C" fn sp_packet_get_payload(
+    packet: NonNull<Packet>,
+) -> SPByteSlice {
+    unsafe { SPByteSlice::from_slice(&mut *(*packet.as_ptr()).payload) }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn sp_packet_set_payload(
+    packet: NonNull<Packet>,
+    data: SPByteSlice,
+) {
+    unsafe { (*packet.as_ptr()).payload = data.as_slice().to_vec() }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn sp_packet_write_to(
+    packet: NonNull<Packet>,
+    buffer: SPByteSlice,
+) {
+    unsafe {
+        packet.as_ref().serialize_to(buffer.as_slice_mut());
+    }
 }
 
 /// Clones a [SPPacket].
@@ -144,10 +153,9 @@ pub unsafe extern "C" fn sp_packet_from_parts(
 ///   by explicitly calling `sp_packet_free`.
 #[no_mangle]
 pub unsafe extern "C" fn sp_packet_clone(
-    packet: *const SPPacket,
+    packet: NonNull<Packet>,
-) -> NonNull<SPPacket> {
+) -> NonNull<Packet> {
-    assert!(!packet.is_null());
+    let result = Box::new(unsafe { packet.as_ref().clone() });
-    let result = Box::new(SPPacket(unsafe { (*packet).0.clone() }));
     NonNull::from(Box::leak(result))
 }
 
@@ -164,7 +172,6 @@ pub unsafe extern "C" fn sp_packet_clone(
 /// - `packet` points to a valid [SPPacket]
 /// - `packet` is not used concurrently or after this call
 #[no_mangle]
-pub unsafe extern "C" fn sp_packet_free(packet: *mut SPPacket) {
+pub unsafe extern "C" fn sp_packet_free(packet: NonNull<Packet>) {
-    assert!(!packet.is_null());
+    _ = unsafe { Box::from_raw(packet.as_ptr()) }
-    _ = unsafe { Box::from_raw(packet) }
 }