Skip to content

Commit cb63ca5

Browse files
rickgaiserrickgaiser
committed
Revert "feat: libsd feature update"
This reverts commit 71e8c33.
1 parent 2c32dae commit cb63ca5

File tree

13 files changed

+1926
-2662
lines changed

13 files changed

+1926
-2662
lines changed

‎iop/sound/libsd/Makefile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# ____| | ____| | | |____|
33
# | ___| |____ ___| ____| | \ PS2DEV Open Source Project.
44
#-----------------------------------------------------------------------
5-
# Copyright ps2dev - http://www.ps2dev.org
5+
# Copyright 2001-2004, ps2dev - http://www.ps2dev.org
66
# Licenced under Academic Free License version 2.0
77
# Review ps2sdk README & LICENSE files for further details.
88

@@ -13,10 +13,9 @@ IOP_IMPORT_INCS += \
1313
system/loadcore \
1414
system/sifman \
1515
system/stdio \
16-
system/sysclib \
17-
system/threadman
16+
system/sysclib
1817

19-
IOP_OBJS = libsd.o imports.o exports.o
18+
IOP_OBJS = freesd.o batch.o block.o effect.o voice.o exports.o imports.o
2019

2120
include $(PS2SDKSRC)/Defs.make
2221
include $(PS2SDKSRC)/iop/Rules.bin.make

‎iop/sound/libsd/README‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FREESD v1.0
2+
Copyright (c) 2004 TyRaNiD <[email protected]>
3+
Copyright (c) 2004 Lukasz Bruun <[email protected]>
4+
Licensed under the Academic Free License version 2.0.
5+
--
6+
7+
FREESD is a LIBSD compatible sound driver for PS2.
8+
9+
Some early Japanse PS2 models came without LIBSD
10+
in the BIOS, this will work as a free replacement.
11+
12+
Credits:
13+
Neill Corlett <[email protected]> for very valuable information on sound registers.
14+
[RO]man <[email protected]> for register information.
15+
adresd <[email protected]>, Nicholas Van Veen <[email protected]>, Vzzrzzn,
16+
MrHTFord <[email protected]> for their work with libsd and thereby providing test data.
17+

‎iop/sound/libsd/README.md‎

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

‎iop/sound/libsd/src/batch.c‎

Lines changed: 243 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,243 @@
1+
/*
2+
* Copyright (c) 2004 TyRaNiD <[email protected]>
3+
* Copyright (c) 2004,2007 Lukasz Bruun <[email protected]>
4+
*
5+
* See the file LICENSE included with this distribution for licensing terms.
6+
*/
7+
8+
/**
9+
* @file
10+
* Part of the IOP Sound Driver
11+
*/
12+
13+
#include "types.h"
14+
#include "sifman.h"
15+
#include "intrman.h"
16+
#include "libsd.h"
17+
#include "spu2regs.h"
18+
19+
u32 BatchData __attribute__((aligned(16)));
20+
21+
s32 SifDmaBatch(u32 ee_addr, void *iop_addr, u32 size)
22+
{
23+
SifDmaTransfer_t dma;
24+
s32 intr_stat;
25+
s32 dma_id;
26+
27+
dma.src = iop_addr;
28+
dma.dest = (void *)ee_addr;
29+
dma.size = size;
30+
dma.attr = 0;
31+
32+
CpuSuspendIntr((int *)&intr_stat);
33+
dma_id = SifSetDma(&dma, SIF_DMA_TO_EE);
34+
CpuResumeIntr(intr_stat);
35+
36+
while(SifDmaStat(dma_id) >= 0);
37+
38+
if(dma_id == 0) return -1;
39+
40+
return 0;
41+
}
42+
43+
int sceSdProcBatch(const sceSdBatch *batch, u32 *rets, u32 num)
44+
{
45+
s32 loop;
46+
s32 ret;
47+
48+
for(loop = 0; (u32)loop < num; loop++)
49+
{
50+
ret = 0;
51+
52+
switch(batch[loop].func)
53+
{
54+
case SD_BATCH_SETPARAM:
55+
sceSdSetParam(batch[loop].entry, batch[loop].value);
56+
break;
57+
case SD_BATCH_GETPARAM:
58+
ret = sceSdGetParam(batch[loop].entry);
59+
break;
60+
case SD_BATCH_SETSWITCH:
61+
sceSdSetSwitch(batch[loop].entry, batch[loop].value);
62+
break;
63+
case SD_BATCH_GETSWITCH:
64+
ret = sceSdGetSwitch(batch[loop].entry);
65+
break;
66+
case SD_BATCH_SETADDR:
67+
sceSdSetAddr(batch[loop].entry, batch[loop].value);
68+
break;
69+
case SD_BATCH_GETADDR:
70+
ret = sceSdGetAddr(batch[loop].entry);
71+
break;
72+
case SD_BATCH_SETCORE:
73+
sceSdSetCoreAttr(batch[loop].entry, batch[loop].value);
74+
break;
75+
case SD_BATCH_GETCORE:
76+
ret = sceSdGetCoreAttr(batch[loop].entry);
77+
break;
78+
case SD_BATCH_WRITEIOP:
79+
*((u32 *) batch[loop].value) = batch[loop].entry;
80+
break;
81+
case SD_BATCH_WRITEEE:
82+
BatchData = batch[loop].entry;
83+
SifDmaBatch(batch[loop].value, &BatchData, 4);
84+
break;
85+
case SD_BATCH_EERETURN:
86+
SifDmaBatch(batch[loop].value, rets, batch[loop].entry);
87+
break;
88+
default:
89+
return -1 - loop;
90+
}
91+
92+
if(rets) rets[loop] = ret;
93+
}
94+
95+
return loop;
96+
}
97+
98+
int sceSdProcBatchEx(const sceSdBatch *batch, u32 *rets, u32 num, u32 voice)
99+
{
100+
s32 loop;
101+
s32 ret;
102+
s32 voice_loop;
103+
s32 cmd_count;
104+
105+
cmd_count = 0;
106+
107+
for(loop = 0; (u32)loop < num; loop++)
108+
{
109+
ret = 0;
110+
switch(batch[loop].func)
111+
{
112+
case SD_BATCH_SETPARAM:
113+
{
114+
if((batch[loop].entry & 0x3E) != 0x3E)
115+
{
116+
sceSdSetParam(batch[loop].entry, batch[loop].value);
117+
}
118+
else
119+
{
120+
for(voice_loop = 0; voice_loop < 24; voice_loop++)
121+
{
122+
if(voice & (1 << voice_loop))
123+
{
124+
sceSdSetParam((batch[loop].entry & 0xFFC1) | (1 << (voice_loop + 1)), batch[loop].value);
125+
cmd_count++;
126+
}
127+
}
128+
cmd_count--;
129+
}
130+
} break;
131+
132+
case SD_BATCH_GETPARAM:
133+
{
134+
if((batch[loop].entry & 0x3E) != 0x3E)
135+
{
136+
ret = sceSdGetParam(batch[loop].entry);
137+
}
138+
else
139+
{
140+
for(voice_loop = 0; voice_loop < 24; voice_loop++)
141+
{
142+
if(voice & (1 << voice_loop))
143+
{
144+
ret = sceSdGetParam((batch[loop].entry & 0xFFC1) | (1 << (voice_loop + 1)));
145+
cmd_count++;
146+
}
147+
148+
if(rets)
149+
{
150+
rets[cmd_count] = ret;
151+
}
152+
}
153+
154+
cmd_count--;
155+
}
156+
} break;
157+
158+
case SD_BATCH_SETSWITCH:
159+
sceSdSetSwitch(batch[loop].entry, batch[loop].value);
160+
break;
161+
162+
case SD_BATCH_GETSWITCH:
163+
ret = sceSdGetSwitch(batch[loop].entry);
164+
break;
165+
166+
case SD_BATCH_SETADDR:
167+
{
168+
if((batch[loop].entry & 0x3E) != 0x3E)
169+
{
170+
sceSdSetAddr(batch[loop].entry, batch[loop].value);
171+
}
172+
else
173+
{
174+
for(voice_loop = 0; voice_loop < 24; voice_loop++)
175+
{
176+
if(voice & (1 << voice_loop))
177+
{
178+
sceSdSetAddr((batch[loop].entry & 0xFFC1) | (1 << (voice_loop + 1)), batch[loop].value);
179+
cmd_count++;
180+
}
181+
}
182+
}
183+
cmd_count--;
184+
} break;
185+
186+
case SD_BATCH_GETADDR:
187+
{
188+
if((batch[loop].entry & 0x3E) != 0x3E)
189+
{
190+
ret = sceSdGetAddr(batch[loop].entry);
191+
}
192+
else
193+
{
194+
for(voice_loop = 0; voice_loop < 24; voice_loop++)
195+
{
196+
if(voice & (1 << voice_loop))
197+
{
198+
ret = sceSdGetAddr((batch[loop].entry & 0xFFC1) | (1 << (voice_loop + 1)));
199+
cmd_count++;
200+
}
201+
202+
if(rets)
203+
{
204+
rets[cmd_count] = ret;
205+
}
206+
}
207+
}
208+
cmd_count--;
209+
} break;
210+
211+
case SD_BATCH_SETCORE:
212+
sceSdSetCoreAttr(batch[loop].entry, batch[loop].value);
213+
break;
214+
215+
case SD_BATCH_GETCORE:
216+
ret = sceSdGetCoreAttr(batch[loop].entry);
217+
break;
218+
219+
case SD_BATCH_WRITEIOP:
220+
*((u32 *) batch[loop].value) = batch[loop].entry;
221+
break;
222+
223+
case SD_BATCH_WRITEEE:
224+
BatchData = batch[loop].entry;
225+
SifDmaBatch(batch[loop].value, &BatchData, 4);
226+
break;
227+
228+
case SD_BATCH_EERETURN:
229+
SifDmaBatch(batch[loop].value, rets, batch[loop].entry);
230+
break;
231+
default:
232+
return -1 - cmd_count;
233+
}
234+
235+
if(rets)
236+
{
237+
rets[cmd_count] = ret;
238+
}
239+
cmd_count++;
240+
}
241+
242+
return cmd_count;
243+
}

0 commit comments

Comments
 (0)