Skip to content

Commit 25f9cbe

Browse files
committed
Remove ISR calls in WD_Deinit() + Remove heap references + Pass wd_fd instead of WD_GetWork() in WD_Deinit().
1 parent e63114e commit 25f9cbe

1 file changed

Lines changed: 1 addition & 25 deletions

File tree

libogc/wd.c

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
#include <string.h>
3636
#include <ogc/machine/processor.h>
3737

38-
//#define WD_HEAP_SIZE 0x1000
39-
4038
#define DEFAULT_CHANNEL_BITMAP 0xfffe
4139

4240
enum WDIOCTLV
@@ -65,14 +63,8 @@ enum WDIOCTLV
6563
extern void usleep(u32 t);
6664

6765
s32 wd_fd = -1;
68-
s32 wd_heap = -1;
69-
70-
s32* WD_GetWork() {
71-
return &wd_fd;
72-
}
7366

7467
u8 NCDcommonbuff[0x20] __attribute__((aligned(32)));
75-
//s32 NCDheap;
7668

7769
s32 NCD_LockWirelessDriver() {
7870
s32 NCD = IOS_Open("/dev/net/ncd/manage", 0);
@@ -117,18 +109,6 @@ u32 NCD_UnlockWirelessDriver(s32 lockid) {
117109
NCD = -1;
118110
return ret;
119111
}
120-
/*
121-
s32 WD_CreateHeap() { // Currently unused.
122-
s32 heap;
123-
u32 level;
124-
125-
_CPU_ISR_Disable(level);
126-
heap = iosCreateHeap(WD_HEAP_SIZE);
127-
_CPU_ISR_Restore(level);
128-
129-
return heap;
130-
}
131-
*/
132112

133113
void WD_SetDefaultScanParameters(ScanParameters* set) {
134114
set->ChannelBitmap = DEFAULT_CHANNEL_BITMAP;
@@ -154,12 +134,8 @@ int WD_Init(u8 mode) {
154134
void WD_Deinit() {
155135
if(wd_fd < 0) return;
156136

157-
u32 level;
158-
159-
_CPU_ISR_Disable(level);
160-
IOS_Close(*WD_GetWork());
137+
IOS_Close(wd_fd);
161138
wd_fd = -1;
162-
_CPU_ISR_Restore(level);
163139
}
164140

165141
u8 WD_GetRadioLevel(BSSDescriptor* Bss) {

0 commit comments

Comments
 (0)