diff --git a/third_party/libtock-drivers/src/nfc.rs b/third_party/libtock-drivers/src/nfc.rs
index 977b49b..8a0c7c6 100644
--- a/third_party/libtock-drivers/src/nfc.rs
+++ b/third_party/libtock-drivers/src/nfc.rs
@@ -9,6 +9,7 @@ mod command_nr {
     pub const RECEIVE: usize = 2;
     pub const EMULATE: usize = 3;
     pub const CONFIGURE: usize = 4;
+    pub const FRAMEDELAYMAX: usize = 5;
 }
 
 mod subscribe_nr {
@@ -22,96 +23,122 @@ mod allow_nr {
     pub const RECEIVE: usize = 2;
 }
 
-pub fn enable_emulation() {
-    emulate(true);
-}
-
-pub fn disable_emulation() {
-    emulate(false);
-}
-
-pub fn emulate(enabled: bool) -> bool {
-    let result_code = syscalls::command(DRIVER_NUMBER, command_nr::EMULATE, enabled as usize, 0);
-    if result_code.is_err() {
-        return false;
-    }
-
-    true
-}
-
-pub fn selected() -> bool {
-    let is_selected = Cell::new(false);
-    let mut is_selected_alarm = || is_selected.set(true);
-    let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>(
-        DRIVER_NUMBER,
-        subscribe_nr::SELECT,
-        &mut is_selected_alarm,
-    );
-    if subscription.is_err() {
-        return false;
-    }
-
-    util::yieldk_for(|| is_selected.get());
-    true
-}
-
-pub fn configure(tag_type: u8) -> bool {
-    let result_code = syscalls::command(DRIVER_NUMBER, command_nr::CONFIGURE, tag_type as usize, 0);
-    if result_code.is_err() {
-        return false;
-    }
-
-    true
-}
-
-pub fn receive(buf: &mut [u8]) -> bool {
-    let result = syscalls::allow(DRIVER_NUMBER, allow_nr::RECEIVE, buf);
-    if result.is_err() {
-        return false;
-    }
-
-    let done = Cell::new(false);
-    let mut alarm = || done.set(true);
-    let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>(
-        DRIVER_NUMBER,
-        subscribe_nr::RECEIVE,
-        &mut alarm,
-    );
-    if subscription.is_err() {
-        return false;
-    }
-
-    let result_code = syscalls::command(DRIVER_NUMBER, command_nr::RECEIVE, 0, 0);
-    if result_code.is_err() {
-        return false;
-    }
-
-    util::yieldk_for(|| done.get());
-    true
-}
-
-pub fn transmit(buf: &mut [u8]) -> bool {
-    let result = syscalls::allow(DRIVER_NUMBER, allow_nr::TRANSMIT, buf);
-    if result.is_err() {
-        return false;
-    }
-
-    let done = Cell::new(false);
-    let mut alarm = || done.set(true);
-    let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>(
-        DRIVER_NUMBER,
-        subscribe_nr::TRANSMIT,
-        &mut alarm,
-    );
-    if subscription.is_err() {
-        return false;
-    }
-
-    let result_code = syscalls::command(DRIVER_NUMBER, command_nr::TRANSMIT, 0, 0);
-    if result_code.is_err() {
-        return false;
-    }
-
-    util::yieldk_for(|| done.get());
-    true
+pub struct NfcTag {}
+
+impl NfcTag {
+    pub fn enable_emulation() {
+        NfcTag::emulate(true);
+    }
+
+    pub fn disable_emulation() {
+        NfcTag::emulate(false);
+    }
+
+    pub fn emulate(enabled: bool) -> bool {
+        let result_code =
+            syscalls::command(DRIVER_NUMBER, command_nr::EMULATE, enabled as usize, 0);
+        if result_code.is_err() {
+            return false;
+        }
+
+        true
+    }
+
+    /// Subscribe to the tag being SELECTED callback.
+    pub fn selected() -> bool {
+        let is_selected = Cell::new(false);
+        let mut is_selected_alarm = || is_selected.set(true);
+        let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>(
+            DRIVER_NUMBER,
+            subscribe_nr::SELECT,
+            &mut is_selected_alarm,
+        );
+        if subscription.is_err() {
+            return false;
+        }
+
+        util::yieldk_for(|| is_selected.get());
+        true
+    }
+
+    /// Configure the tag type command.
+    pub fn configure(tag_type: u8) -> bool {
+        let result_code =
+            syscalls::command(DRIVER_NUMBER, command_nr::CONFIGURE, tag_type as usize, 0);
+        if result_code.is_err() {
+            return false;
+        }
+
+        true
+    }
+
+    /// Set the maximum frame delay value to support
+    /// transmission with the reader.
+    pub fn set_framedelaymax(delay: u32) -> bool {
+        let result_code =
+            syscalls::command(DRIVER_NUMBER, command_nr::FRAMEDELAYMAX, delay as usize, 0);
+        if result_code.is_err() {
+            return false;
+        }
+
+        true
+    }
+
+    /// 1. Share with the driver a buffer.
+    /// 2. Subscribe to having a successful receive callback.
+    /// 3. Issue the request for reception.
+    pub fn receive(buf: &mut [u8]) -> bool {
+        let result = syscalls::allow(DRIVER_NUMBER, allow_nr::RECEIVE, buf);
+        if result.is_err() {
+            return false;
+        }
+
+        let done = Cell::new(false);
+        let mut alarm = || done.set(true);
+        let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>(
+            DRIVER_NUMBER,
+            subscribe_nr::RECEIVE,
+            &mut alarm,
+        );
+        if subscription.is_err() {
+            return false;
+        }
+
+        let result_code = syscalls::command(DRIVER_NUMBER, command_nr::RECEIVE, 0, 0);
+        if result_code.is_err() {
+            return false;
+        }
+
+        util::yieldk_for(|| done.get());
+        true
+    }
+
+    /// 1. Share with the driver a buffer containing the app's reply.
+    /// 2. Subscribe to having a successful transmission callback.
+    /// 3. Issue the request for transmitting.
+    pub fn transmit(buf: &mut [u8], amount: usize) -> bool {
+        let result = syscalls::allow(DRIVER_NUMBER, allow_nr::TRANSMIT, buf);
+        if result.is_err() {
+            return false;
+        }
+
+        let done = Cell::new(false);
+        let mut alarm = || done.set(true);
+        let subscription = syscalls::subscribe::<callback::Identity0Consumer, _>(
+            DRIVER_NUMBER,
+            subscribe_nr::TRANSMIT,
+            &mut alarm,
+        );
+        if subscription.is_err() {
+            return false;
+        }
+
+        let result_code = syscalls::command(DRIVER_NUMBER, command_nr::TRANSMIT, amount, 0);
+        if result_code.is_err() {
+            return false;
+        }
+
+        util::yieldk_for(|| done.get());
+        true
+    }
 }