diff --git a/.github/docs/index.html b/.github/docs/index.html
old mode 100644
new mode 100755
diff --git a/.github/workflows/merge_checks.yml b/.github/workflows/merge_checks.yml
old mode 100644
new mode 100755
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
old mode 100644
new mode 100755
diff --git a/Cargo.toml b/Cargo.toml
old mode 100644
new mode 100755
diff --git a/nx-derive/Cargo.toml b/nx-derive/Cargo.toml
old mode 100644
new mode 100755
diff --git a/nx-derive/src/ipc_traits.rs b/nx-derive/src/ipc_traits.rs
old mode 100644
new mode 100755
diff --git a/nx-derive/src/lib.rs b/nx-derive/src/lib.rs
old mode 100644
new mode 100755
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
old mode 100644
new mode 100755
diff --git a/src/applet.rs b/src/applet.rs
old mode 100644
new mode 100755
diff --git a/src/console.rs b/src/console.rs
old mode 100644
new mode 100755
diff --git a/src/exception.rs b/src/exception.rs
old mode 100644
new mode 100755
diff --git a/src/fs/subdir.rs b/src/fs/subdir.rs
old mode 100644
new mode 100755
diff --git a/src/gpu/canvas.rs b/src/gpu/canvas.rs
old mode 100644
new mode 100755
diff --git a/src/ipc.rs b/src/ipc.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/client.rs b/src/ipc/client.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/server.rs b/src/ipc/server.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf.rs b/src/ipc/sf.rs
old mode 100644
new mode 100755
index d926a2cb6..839652771
--- a/src/ipc/sf.rs
+++ b/src/ipc/sf.rs
@@ -333,6 +333,7 @@ impl<
}
impl<
+ const IN: bool,
const MAP_ALIAS: bool,
const POINTER: bool,
const FIXED_SIZE: bool,
@@ -343,7 +344,7 @@ impl<
>
Buffer<
'_,
- true,
+ IN,
true,
MAP_ALIAS,
POINTER,
diff --git a/src/ipc/sf/audio.rs b/src/ipc/sf/audio.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/audio/rc.rs b/src/ipc/sf/audio/rc.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/bsd.rs b/src/ipc/sf/bsd.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/bsd/rc.rs b/src/ipc/sf/bsd/rc.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/hid.rs b/src/ipc/sf/hid.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/lr.rs b/src/ipc/sf/lr.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/mii.rs b/src/ipc/sf/mii.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/ncm.rs b/src/ipc/sf/ncm.rs
old mode 100644
new mode 100755
diff --git a/src/ipc/sf/nfp.rs b/src/ipc/sf/nfp.rs
old mode 100644
new mode 100755
index b8d13a045..1c154a76f
--- a/src/ipc/sf/nfp.rs
+++ b/src/ipc/sf/nfp.rs
@@ -43,7 +43,6 @@ pub enum DeviceState {
TagRemoved = 3,
TagMounted = 4,
Unavailable = 5,
- Finalized = 6,
}
#[derive(Request, Response, Copy, Clone, PartialEq, Eq, Debug)]
@@ -70,10 +69,17 @@ const_assert!(core::mem::size_of::() == 0x4);
#[derive(Request, Response, Copy, Clone, PartialEq, Eq, Debug)]
#[repr(C)]
-pub struct TagInfo {
+pub struct TagId {
pub uuid: [u8; 10],
pub uuid_length: u8,
pub reserved_1: [u8; 0x15],
+}
+const_assert!(core::mem::size_of::() == 0x20);
+
+#[derive(Request, Response, Copy, Clone, PartialEq, Eq, Debug)]
+#[repr(C)]
+pub struct TagInfo {
+ pub uid: TagId,
pub protocol: u32,
pub tag_type: u32,
pub reserved_2: [u8; 0x30],
@@ -106,11 +112,10 @@ const_assert!(core::mem::size_of::() == 0x40);
#[derive(Request, Response, Copy, Clone, PartialEq, Eq, Debug)]
#[repr(C)]
pub struct ModelInfo {
- pub game_character_id: u16,
- pub character_variant: u8,
- pub series: u8,
- pub model_number: u16,
- pub figure_type: u8,
+ pub character_id: [u8; 3],
+ pub series_id: u8,
+ pub numbering_id: u16,
+ pub nfp_type: u8,
pub reserved: [u8; 0x39],
}
const_assert!(core::mem::size_of::() == 0x40);
@@ -135,26 +140,15 @@ pub enum ApplicationAreaVersion {
NintendoSwitch = 3,
}
-#[derive(Request, Response, Copy, Clone, PartialEq, Eq, Debug, Default)]
-#[repr(u8)]
-pub enum ConsoleFamily {
- // Note: unofficial name
- #[default]
- Default = 0,
- NintendoWiiU = 1,
- Nintendo3DS = 2,
- NintendoSwitch = 3,
-}
-
#[derive(Request, Response, Copy, Clone, PartialEq, Eq, Debug)]
#[repr(C)]
pub struct AdminInfo {
- pub program_id: ncm::ProgramId,
+ pub app_id: ncm::ProgramId,
pub access_id: AccessId,
- pub crc32_change_counter: u16,
+ pub terminal_id_crc32_change_counter: u16,
pub flags: AdminInfoFlags,
- pub tag_type: u8,
- pub console_family: ConsoleFamily,
+ pub unk: u8,
+ pub app_area_version: ApplicationAreaVersion,
pub pad: [u8; 0x7],
pub reserved: [u8; 0x28],
}
@@ -166,7 +160,7 @@ pub struct RegisterInfoPrivate {
pub mii_store_data: mii::StoreData,
pub first_write_date: Date,
pub name: util::ArrayString<41>,
- pub unk: u8,
+ pub font_region: u8,
pub reserved: [u8; 0x8E],
}
const_assert!(core::mem::size_of::() == 0x100);
diff --git a/src/lib.rs b/src/lib.rs
old mode 100644
new mode 100755
diff --git a/src/macros/alloc.rs b/src/macros/alloc.rs
old mode 100644
new mode 100755
diff --git a/src/macros/ipc/sf.rs b/src/macros/ipc/sf.rs
old mode 100644
new mode 100755
diff --git a/src/macros/sync.rs b/src/macros/sync.rs
old mode 100644
new mode 100755
diff --git a/src/macros/util.rs b/src/macros/util.rs
index e00942c62..94b094fe1 100755
--- a/src/macros/util.rs
+++ b/src/macros/util.rs
@@ -73,7 +73,7 @@ macro_rules! bit {
/// # Examples
///
/// ```
-/// bit_enum! {
+/// define_bit_set! {
/// Test (u32) {
/// A = bit!(1),
/// B = bit!(2)
@@ -170,12 +170,12 @@ macro_rules! define_bit_set {
};
}
-/// Constructs a `bit_enum` type value from various flags
+/// Constructs a `define_bit_set` type value from various flags
///
/// # Examples
///
/// ```
-/// bit_enum! {
+/// define_bit_set! {
/// Test (u32) {
/// A = bit!(1),
/// B = bit!(2)
diff --git a/src/mem.rs b/src/mem.rs
old mode 100644
new mode 100755
diff --git a/src/mem/alloc.rs b/src/mem/alloc.rs
old mode 100644
new mode 100755
diff --git a/src/mii.rs b/src/mii.rs
old mode 100644
new mode 100755
diff --git a/src/rrt0.rs b/src/rrt0.rs
old mode 100644
new mode 100755
diff --git a/src/service/audio.rs b/src/service/audio.rs
old mode 100644
new mode 100755
diff --git a/src/service/bsd.rs b/src/service/bsd.rs
old mode 100644
new mode 100755
diff --git a/src/service/lr.rs b/src/service/lr.rs
old mode 100644
new mode 100755
diff --git a/src/service/ncm.rs b/src/service/ncm.rs
old mode 100644
new mode 100755
diff --git a/src/socket.rs b/src/socket.rs
old mode 100644
new mode 100755
diff --git a/src/svc/asm.rs b/src/svc/asm.rs
old mode 100644
new mode 100755
index 0bf56f25b..d77cd2591
--- a/src/svc/asm.rs
+++ b/src/svc/asm.rs
@@ -1,6 +1,5 @@
use core::arch::naked_asm as nasm;
-use crate::macros::util::maybe_cfi;
use crate::result::ResultCode;
use crate::svc::{CreateProcessInfo, DebugThreadParam, SystemInfoParam};
use crate::{arm, svc::PhysicalMemoryInfo};
diff --git a/src/sync.rs b/src/sync.rs
old mode 100644
new mode 100755
diff --git a/src/sync/sys.rs b/src/sync/sys.rs
old mode 100644
new mode 100755
diff --git a/src/sync/sys/futex.rs b/src/sync/sys/futex.rs
old mode 100644
new mode 100755
diff --git a/src/sync/sys/mutex.rs b/src/sync/sys/mutex.rs
old mode 100644
new mode 100755
diff --git a/src/sync/sys/rwlock.rs b/src/sync/sys/rwlock.rs
old mode 100644
new mode 100755
diff --git a/src/thread.rs b/src/thread.rs
old mode 100644
new mode 100755
diff --git a/src/thread/scoped.rs b/src/thread/scoped.rs
old mode 100644
new mode 100755
diff --git a/src/vmem.rs b/src/vmem.rs
old mode 100644
new mode 100755