Skip to content

Commit 0599ce4

Browse files
pgrawehrpgrawehr
committed
Adjust namespaces
1 parent 0d60d18 commit 0599ce4

File tree

8 files changed

+23
-47
lines changed

8 files changed

+23
-47
lines changed

‎src/System.Device.Gpio.Tests/LibGpiodV2DriverTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Device.Gpio.Drivers;
5-
using System.Device.Gpio.Drivers.Libgpiod.V2;
5+
using System.Device.Gpio.System.Device.Gpio.Drivers.Libgpiod;
66
using System.Diagnostics;
77
using System.Threading.Tasks;
88
using Xunit;

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/GpiodException.cs‎ renamed to ‎src/System.Device.Gpio/System/Device/Gpio/Drivers/GpiodException.cs‎

File renamed without changes.

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/LibGpiodDriver.cs‎ renamed to ‎src/System.Device.Gpio/System/Device/Gpio/Drivers/LibGpiodDriver.cs‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using System.Threading;
66
using System.Runtime.InteropServices;
77
using System.Collections.Concurrent;
8-
using System.Device.Gpio.Drivers.Libgpiod.V1;
9-
using System.Device.Gpio.Drivers.Libgpiod.V2;
108
using System.Device.Gpio.Libgpiod.V1;
119
using System.Diagnostics;
1210
using System.Linq;
@@ -27,7 +25,7 @@ public class LibGpiodDriver : UnixDriver
2725
private static string s_consumerName = Process.GetCurrentProcess().ProcessName;
2826
private readonly object _pinNumberLock;
2927
private readonly ConcurrentDictionary<int, LineHandle> _pinNumberToSafeLineHandle;
30-
private readonly ConcurrentDictionary<int, LibGpiodV1DriverEventHandler> _pinNumberToEventHandler;
28+
private readonly ConcurrentDictionary<int, LibGpiodDriverEventHandler> _pinNumberToEventHandler;
3129
private readonly int _pinCount;
3230
private readonly ConcurrentDictionary<int, PinValue> _pinValue;
3331
private SafeChipHandle _chip;
@@ -85,7 +83,7 @@ public LibGpiodDriver(int gpioChip = 0)
8583
}
8684

8785
_pinCount = LibgpiodV1.gpiod_chip_num_lines(_chip);
88-
_pinNumberToEventHandler = new ConcurrentDictionary<int, LibGpiodV1DriverEventHandler>();
86+
_pinNumberToEventHandler = new ConcurrentDictionary<int, LibGpiodDriverEventHandler>();
8987
_pinNumberToSafeLineHandle = new ConcurrentDictionary<int, LineHandle>();
9088
_pinValue = new ConcurrentDictionary<int, PinValue>();
9189
}
@@ -134,7 +132,7 @@ protected internal override void AddCallbackForPinValueChangedEvent(int pinNumbe
134132
{
135133
if ((eventTypes & PinEventTypes.Rising) != 0 || (eventTypes & PinEventTypes.Falling) != 0)
136134
{
137-
LibGpiodV1DriverEventHandler eventHandler = _pinNumberToEventHandler.GetOrAdd(pinNumber, PopulateEventHandler);
135+
LibGpiodDriverEventHandler eventHandler = _pinNumberToEventHandler.GetOrAdd(pinNumber, PopulateEventHandler);
138136

139137
if ((eventTypes & PinEventTypes.Rising) != 0)
140138
{
@@ -152,7 +150,7 @@ protected internal override void AddCallbackForPinValueChangedEvent(int pinNumbe
152150
}
153151
}
154152

155-
private LibGpiodV1DriverEventHandler PopulateEventHandler(int pinNumber)
153+
private LibGpiodDriverEventHandler PopulateEventHandler(int pinNumber)
156154
{
157155
lock (_pinNumberLock)
158156
{
@@ -165,7 +163,7 @@ private LibGpiodV1DriverEventHandler PopulateEventHandler(int pinNumber)
165163
_pinNumberToSafeLineHandle[pinNumber] = pinHandle;
166164
}
167165

168-
return new LibGpiodV1DriverEventHandler(pinNumber, pinHandle!);
166+
return new LibGpiodDriverEventHandler(pinNumber, pinHandle!);
169167
}
170168
}
171169

@@ -297,7 +295,7 @@ protected internal override void Toggle(int pinNumber)
297295
/// <inheritdoc/>
298296
protected internal override void RemoveCallbackForPinValueChangedEvent(int pinNumber, PinChangeEventHandler callback)
299297
{
300-
if (_pinNumberToEventHandler.TryGetValue(pinNumber, out LibGpiodV1DriverEventHandler? eventHandler))
298+
if (_pinNumberToEventHandler.TryGetValue(pinNumber, out LibGpiodDriverEventHandler? eventHandler))
301299
{
302300
eventHandler.ValueFalling -= callback;
303301
eventHandler.ValueRising -= callback;
@@ -383,7 +381,7 @@ protected internal override WaitForEventResult WaitForEvent(int pinNumber, PinEv
383381
{
384382
if ((eventTypes & PinEventTypes.Rising) != 0 || (eventTypes & PinEventTypes.Falling) != 0)
385383
{
386-
LibGpiodV1DriverEventHandler eventHandler = _pinNumberToEventHandler.GetOrAdd(pinNumber, PopulateEventHandler);
384+
LibGpiodDriverEventHandler eventHandler = _pinNumberToEventHandler.GetOrAdd(pinNumber, PopulateEventHandler);
387385

388386
if ((eventTypes & PinEventTypes.Rising) != 0)
389387
{
@@ -460,9 +458,9 @@ protected override void Dispose(bool disposing)
460458
{
461459
if (_pinNumberToEventHandler != null)
462460
{
463-
foreach (KeyValuePair<int, LibGpiodV1DriverEventHandler> kv in _pinNumberToEventHandler)
461+
foreach (KeyValuePair<int, LibGpiodDriverEventHandler> kv in _pinNumberToEventHandler)
464462
{
465-
LibGpiodV1DriverEventHandler eventHandler = kv.Value;
463+
LibGpiodDriverEventHandler eventHandler = kv.Value;
466464
eventHandler.Dispose();
467465
}
468466

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/V1/LibGpiodV1DriverEventHandler.cs‎ renamed to ‎src/System.Device.Gpio/System/Device/Gpio/Drivers/LibGpiodDriverEventHandler.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
using System.Threading.Tasks;
99
using LibgpiodV1 = Interop.LibgpiodV1;
1010

11-
namespace System.Device.Gpio.Drivers.Libgpiod.V1;
11+
namespace System.Device.Gpio.Drivers;
1212

13-
internal sealed class LibGpiodV1DriverEventHandler : IDisposable
13+
internal sealed class LibGpiodDriverEventHandler : IDisposable
1414
{
1515
private const int ERROR_CODE_EINTR = 4; // Interrupted system call
1616

@@ -24,7 +24,7 @@ internal sealed class LibGpiodV1DriverEventHandler : IDisposable
2424
private readonly Task _task;
2525
private bool _disposing;
2626

27-
public LibGpiodV1DriverEventHandler(int pinNumber, LineHandle safeLineHandle)
27+
public LibGpiodDriverEventHandler(int pinNumber, LineHandle safeLineHandle)
2828
{
2929
_pinNumber = pinNumber;
3030
_cancellationTokenSource = new CancellationTokenSource();
@@ -53,8 +53,8 @@ private Task InitializeEventDetectionTask(CancellationToken token, LineHandle pi
5353
// WaitEventResult can be TimedOut, EventOccured or Error, in case of TimedOut will continue waiting
5454
TimeSpec timeout = new TimeSpec
5555
{
56-
TvSec = new IntPtr(0),
57-
TvNsec = new IntPtr(50_000_000)
56+
TvSec = new nint(0),
57+
TvNsec = new nint(50_000_000)
5858
};
5959

6060
WaitEventResult waitResult = LibgpiodV1.gpiod_line_event_wait(pinHandle.Handle, ref timeout);
@@ -79,7 +79,7 @@ private Task InitializeEventDetectionTask(CancellationToken token, LineHandle pi
7979
throw ExceptionHelper.GetIOException(ExceptionResource.EventReadError, Marshal.GetLastWin32Error());
8080
}
8181

82-
PinEventTypes eventType = (eventResult.event_type == 1) ? PinEventTypes.Rising : PinEventTypes.Falling;
82+
PinEventTypes eventType = eventResult.event_type == 1 ? PinEventTypes.Rising : PinEventTypes.Falling;
8383
this?.OnPinValueChanged(new PinValueChangedEventArgs(eventType, _pinNumber), eventType);
8484
}
8585
}

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/V2/LibGpiodV2Driver.cs‎ renamed to ‎src/System.Device.Gpio/System/Device/Gpio/Drivers/LibGpiodV2Driver.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Collections.Generic;
5+
using System.Device.Gpio.Drivers;
56
using System.Device.Gpio.Libgpiod;
67
using System.Device.Gpio.Libgpiod.V2;
78
using System.Diagnostics;
@@ -11,7 +12,7 @@
1112
using System.Linq;
1213
using System.Threading;
1314

14-
namespace System.Device.Gpio.Drivers.Libgpiod.V2;
15+
namespace System.Device.Gpio.Drivers;
1516

1617
/// <summary>
1718
/// Driver that uses libgpiod V2 for GPIO control.

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/V2/LibGpiodV2EventObserver.cs‎ renamed to ‎src/System.Device.Gpio/System/Device/Gpio/Drivers/LibGpiodV2EventObserver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010

11-
namespace System.Device.Gpio.Drivers.Libgpiod.V2;
11+
namespace System.Device.Gpio.Drivers;
1212

1313
/// <summary>
1414
/// Class that observes libgpiod line requests for events.

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/V1/LibGpiodV1Driver.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Libgpiod/V2/Translator.cs‎ renamed to ‎src/System.Device.Gpio/System/Device/Gpio/Drivers/Translator.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
using System.Device.Gpio.Drivers;
45
using System.Device.Gpio.Libgpiod.V2;
56
using System.Diagnostics.CodeAnalysis;
67

7-
namespace System.Device.Gpio.Drivers.Libgpiod.V2;
8+
namespace System.Device.Gpio.Drivers;
89

910
[Experimental(DiagnosticIds.SDGPIO0001, UrlFormat = DiagnosticIds.UrlFormat)]
1011
internal static class Translator
@@ -93,8 +94,8 @@ public static bool Includes(GpiodLineEdge presentEdgeDetection, PinEventTypes pi
9394
return false;
9495
}
9596

96-
return (pinEventTypes == PinEventTypes.Rising && presentEdgeDetection == GpiodLineEdge.Rising) ||
97-
(pinEventTypes == PinEventTypes.Falling && presentEdgeDetection == GpiodLineEdge.Falling);
97+
return pinEventTypes == PinEventTypes.Rising && presentEdgeDetection == GpiodLineEdge.Rising ||
98+
pinEventTypes == PinEventTypes.Falling && presentEdgeDetection == GpiodLineEdge.Falling;
9899
}
99100

100101
public static PinEventTypes Translate(GpiodEdgeEventType gpiodEdgeEventType)

0 commit comments

Comments
 (0)