Clean up some of the custom marshallers

src/cscore/Natives/CsNative.Free.cs

@@ -17,10 +17,6 @@ public static unsafe partial class CsNative
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
     public static partial void ReleaseEnumeratedSinks(int* sinks, int count);
 
-    [LibraryImport("cscore", EntryPoint = "CS_FreeString")]
-    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    public static partial void FreeString(byte* str);
-
     [LibraryImport("cscore", EntryPoint = "CS_FreeEnumPropertyChoices")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
     public static partial void FreeEnumPropertyChoices(byte** choices, int count);

src/hal/Assembly.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: DisableRuntimeMarshalling]

src/hal/JoystickDescriptor.cs

@@ -36,7 +36,7 @@ public readonly unsafe string FromNullTerminatedString()
                 ReadOnlySpan<byte> thisSpan = this;
                 fixed (byte* b = thisSpan)
                 {
-                    return Marshal.PtrToStringUTF8((nint)b)!;
+                    return System.Runtime.InteropServices.Marshal.PtrToStringUTF8((nint)b)!;
                 }
             }
         }

src/wpiutil/Marshal/INullTerminatedStringFree.cs → src/hal/Marshal/INullTerminatedStringFree.cs

@@ -1,4 +1,4 @@
-namespace WPIUtil.Marshal;
+namespace WPIHal.Marshal;
 
 public interface INullTerminatedStringFree<T> where T : unmanaged
 {

src/wpiutil/Marshal/NoFreeNullTerminatedStringFree.cs → src/hal/Marshal/NoFreeNullTerminatedStringFree.cs

@@ -1,4 +1,4 @@
-namespace WPIUtil.Marshal;
+namespace WPIHal.Marshal;
 
 public class NoFreeNullTerminatedStringFree : INullTerminatedStringFree<byte>
 {

src/wpiutil/Marshal/NullTerminatedStringMarshaller.cs → src/hal/Marshal/NullTerminatedStringMarshaller.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Runtime.InteropServices.Marshalling;
+using WPIUtil.Marshal;
 
-namespace WPIUtil.Marshal;
+namespace WPIHal.Marshal;
 
 [CustomMarshaller(typeof(string), MarshalMode.ManagedToUnmanagedOut, typeof(NullTerminatedStringMarshaller<>))]
 [CustomMarshaller(typeof(string), MarshalMode.ElementOut, typeof(NullTerminatedStringMarshaller<>))]

src/hal/MatchInfo.cs

@@ -36,7 +36,7 @@ public readonly unsafe string FromNullTerminatedString()
                 ReadOnlySpan<byte> thisSpan = this;
                 fixed (byte* b = thisSpan)
                 {
-                    return Marshal.PtrToStringUTF8((nint)b)!;
+                    return System.Runtime.InteropServices.Marshal.PtrToStringUTF8((nint)b)!;
                 }
             }
 

src/hal/Natives/HalBase.cs

@@ -2,6 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.Marshalling;
 using WPIHal.Handles;
+using WPIHal.Marshal;
 using WPIUtil.Marshal;
 
 namespace WPIHal.Natives;

src/hal/Natives/HalDriverStation.cs

@@ -37,12 +37,7 @@ public static partial class HalDriverStation
 
     [LibraryImport("wpiHal", EntryPoint = "HAL_GetJoystickName")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    [return: MarshalUsing(typeof(NullTerminatedStringMarshaller<JoystickNameStringFree>))]
-    public static partial string GetJoystickName(int joystickNum);
-
-    [LibraryImport("wpiHal", EntryPoint = "HAL_FreeJoystickName")]
-    [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]
-    public static unsafe partial void FreeJoystickName(byte* joystickName);
+    public static partial void GetJoystickName([MarshalUsing(typeof(WpiStringMarshaller))] out string name, int joystickNum);
 
     [LibraryImport("wpiHal", EntryPoint = "HAL_GetJoystickPOVs")]
     [UnmanagedCallConv(CallConvs = [typeof(CallConvCdecl)])]