[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] [M] Change in haiku[master]: cmedia: enable -Werror
From: Gerrit <review () review ! haiku-os ! org>
Date: 2024-04-13 12:37:50
Message-ID: e7f0e9c87cfe69f637b1cbbfc9e2710f3b0e51b9-HTML () review ! haiku-os ! org
[Download RAW message or body]
From Adrien Destugues <pulkomandy@pulkomandy.tk>:
Adrien Destugues has uploaded this change for review. ( \
https://review.haiku-os.org/c/haiku/+/7621?usp=email )
Change subject: cmedia: enable -Werror
......................................................................
cmedia: enable -Werror
Errors are now enabled for all audio drivers.
Change-Id: Ia4e986f0ed8965376c3bbefc3d9f04bcd68ad561
---
M build/jam/ArchitectureRules
M src/add-ons/kernel/drivers/audio/cmedia/cm.c
M src/add-ons/kernel/drivers/audio/cmedia/cm_private.h
M src/add-ons/kernel/drivers/audio/cmedia/mixer.c
M src/add-ons/kernel/drivers/audio/cmedia/pcm.c
5 files changed, 33 insertions(+), 28 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/21/7621/1
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 7717d3c..fddfea5 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -674,21 +674,12 @@
EnableWerror src add-ons kernel console ;
EnableWerror src add-ons kernel cpu ;
EnableWerror src add-ons kernel debugger ;
- EnableWerror src add-ons kernel drivers audio ac97 ;
-# EnableWerror src add-ons kernel drivers audio cmedia ;
- EnableWerror src add-ons kernel drivers audio echo ;
- EnableWerror src add-ons kernel drivers audio emuxki ;
- EnableWerror src add-ons kernel drivers audio generic ;
- EnableWerror src add-ons kernel drivers audio hda ;
- EnableWerror src add-ons kernel drivers audio ice1712 ;
- EnableWerror src add-ons kernel drivers audio null ;
- EnableWerror src add-ons kernel drivers audio sb16 ;
- EnableWerror src add-ons kernel drivers audio usb ;
- EnableWerror src add-ons kernel drivers audio virtio ;
+ EnableWerror src add-ons kernel drivers audio ;
EnableWerror src add-ons kernel drivers bluetooth ;
EnableWerror src add-ons kernel drivers bus ;
EnableWerror src add-ons kernel drivers common ;
EnableWerror src add-ons kernel drivers disk ;
+# EnableWerror src add-ons kernel drivers display ;
EnableWerror src add-ons kernel drivers dvb ;
# EnableWerror src add-ons kernel drivers graphics ;
EnableWerror src add-ons kernel drivers graphics intel_extreme ;
@@ -731,10 +722,11 @@
EnableWerror src add-ons kernel drivers network wwan ;
EnableWerror src add-ons kernel drivers ports ;
EnableWerror src add-ons kernel drivers power ;
- EnableWerror src add-ons kernel drivers printer ;
- EnableWerror src add-ons kernel drivers random ;
- EnableWerror src add-ons kernel drivers tty ;
+# EnableWerror src add-ons kernel drivers pty ;
+# EnableWerror src add-ons kernel drivers sensor ;
+# EnableWerror src add-ons kernel drivers timer ;
EnableWerror src add-ons kernel drivers video ;
+# EnableWerror src add-ons kernel drivers wmi ;
EnableWerror src add-ons kernel file_systems bfs ;
EnableWerror src add-ons kernel file_systems cdda ;
EnableWerror src add-ons kernel file_systems ext2 ;
diff --git a/src/add-ons/kernel/drivers/audio/cmedia/cm.c \
b/src/add-ons/kernel/drivers/audio/cmedia/cm.c index e24dae0..ede98f2 100644
--- a/src/add-ons/kernel/drivers/audio/cmedia/cm.c
+++ b/src/add-ons/kernel/drivers/audio/cmedia/cm.c
@@ -187,6 +187,7 @@
}
+void dump_card(cmedia_pci_dev * card);
#if 0
void dump_card(cmedia_pci_dev * card)
{
@@ -285,7 +286,7 @@
#if DO_PCM
/* cmedia_pci DMA doesn't work when physical NULL isn't NULL from PCI */
/* this is a hack to not export bad devices on BeBox hardware */
- if ((*pci->ram_address)(NULL) == NULL) {
+ if ((*pci->ram_address)(0) == 0) {
sprintf(card->pcm.name, "audio/raw/%s", name);
names[num_names++] = card->pcm.name;
sprintf(card->pcm.oldname, "audio/old/%s", name);
@@ -401,7 +402,7 @@
ddprintf(("cmedia_pci: successfully found or created low area!\n"));
card->low_size = low_size;
card->low_mem = addr;
- card->low_phys = (vuchar *)(addr_t)where.address;
+ card->low_phys = where.address;
card->map_low = curarea;
return B_OK;
}
@@ -486,10 +487,11 @@
}
dprintf("%s: enhanced registers at 0x%x\n", cards[ix].name,
cards[ix].enhanced);
- dprintf("%s: open %ld dma_a at 0x%x dma_c 0x%x\n", cards[ix].pcm.name,
+ dprintf("%s: open %" B_PRId32 " dma_a at 0x%x dma_c 0x%x\n", \
cards[ix].pcm.name, cards[ix].pcm.open_count, cards[ix].pcm.dma_a, \
cards[ix].pcm.dma_c); if (cards[ix].pcm.open_count) {
- dprintf(" dma_a: 0x%lx+0x%lx dma_c: 0x%lx+0x%lx\n",
+ dprintf(" dma_a: 0x%" B_PRIu32 "+0x%" B_PRIu32 " dma_c: 0x%" B_PRIu32 "+0x%" \
B_PRIu32 + "\n",
PCI_IO_RD_32((int)cards[ix].pcm.dma_a), PCI_IO_RD_32((int)cards[ix].pcm.dma_a+4),
PCI_IO_RD_32((int)cards[ix].pcm.dma_c), \
PCI_IO_RD_32((int)cards[ix].pcm.dma_c+4)); }
@@ -546,7 +548,7 @@
}
#endif
if (setup_cmedia_pci(&cards[num_cards])) {
- dprintf("Setup of C-Media %ld failed\n", num_cards+1);
+ dprintf("Setup of C-Media %d failed\n", num_cards+1);
#ifdef __HAIKU__
(*pci->unreserve_device)(info.bus, info.device, info.function,
DRIVER_NAME, &cards[num_cards]);
diff --git a/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h \
b/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h index cf6c6a4..ccc83d0 100644
--- a/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h
+++ b/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h
@@ -20,7 +20,7 @@
#define DEVNAME 32
-#define EXPORT __declspec(dllexport)
+#define EXPORT __attribute__((visibility("default")))
#if defined(__POWERPC__)
#define EIEIO() __eieio()
@@ -153,7 +153,7 @@
int dma_base;
size_t low_size; /* size of low memory */
vuchar * low_mem;
- vuchar * low_phys; /* physical address */
+ phys_addr_t low_phys; /* physical address */
area_id map_low; /* area pointing to low memory */
pci_info info;
midi_dev midi;
diff --git a/src/add-ons/kernel/drivers/audio/cmedia/mixer.c \
b/src/add-ons/kernel/drivers/audio/cmedia/mixer.c index 1285997..f8a5561 100644
--- a/src/add-ons/kernel/drivers/audio/cmedia/mixer.c
+++ b/src/add-ons/kernel/drivers/audio/cmedia/mixer.c
@@ -69,7 +69,7 @@
static int
map_mixer(int selector) {
- int i;
+ uint32 i;
for (i = 0; i < N_MIXERS; i++)
if (the_mixers[i].selector == selector)
return i;
diff --git a/src/add-ons/kernel/drivers/audio/cmedia/pcm.c \
b/src/add-ons/kernel/drivers/audio/cmedia/pcm.c index a23eb43..9d49f69 100644
--- a/src/add-ons/kernel/drivers/audio/cmedia/pcm.c
+++ b/src/add-ons/kernel/drivers/audio/cmedia/pcm.c
@@ -718,7 +718,6 @@
size_t len)
{
// declarations for SPDIF settings I/O
- static int32 chipinfo[] = { 0,0 };
uchar reg_value;
char DriverVersion[] = "1.3.2 (Jul 17, 2001)";
@@ -1087,12 +1086,12 @@
err = B_OK;
break;
case SOUND_SET_PLAYBACK_PREFERRED_BUF_SIZE:
- config.play_buf_size = (int32)data;
+ config.play_buf_size = (intptr_t)data;
configure = true;
err = B_OK;
break;
case SOUND_SET_CAPTURE_PREFERRED_BUF_SIZE:
- config.rec_buf_size = (int32)data;
+ config.rec_buf_size = (intptr_t)data;
configure = true;
err = B_OK;
break;
@@ -1244,6 +1243,7 @@
// *(int32*)data.vendor_id = cards[0].info.vendor_id;
// *(int32*)data.device_id = cards[0].info.device_id;
+// static int32 chipinfo[] = { 0,0 };
// chipinfo[0] = cards[0].info.vendor_id;
*(int32 *)data = cards[0].info.device_id;
@@ -1351,7 +1351,7 @@
pcm_dev * port = (pcm_dev *)cookie;
size_t to_read = *nread;
status_t err;
- int block;
+ size_t block;
cpu_status cp;
int bytes_xferred;
void * hdrptr = data;
@@ -1433,7 +1433,7 @@
*nread += hdrsize;
hdr.capture_size = *nread;
hdr.sample_rate = port->config.sample_rate;
- if (hdrsize > sizeof(hdr)) {
+ if ((uint32)hdrsize > sizeof(hdr)) {
hdrsize = sizeof(hdr);
}
memcpy(hdrptr, &hdr, hdrsize);
@@ -1635,7 +1635,7 @@
else {
atomic_add(&port->write_waiting, 1);
/* if none there, fill with silence */
- if (port->wr_silence < port->config.play_buf_size*2) {
+ if (port->wr_silence < (int32)port->config.play_buf_size*2) {
if (port->config.format == 0x11) {
memset((void *)ptr, 0x80, port->wr_size);
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/7621?usp=email
To unsubscribe, or for help writing mail filters, visit \
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ia4e986f0ed8965376c3bbefc3d9f04bcd68ad561
Gerrit-Change-Number: 7621
Gerrit-PatchSet: 1
Gerrit-Owner: Adrien Destugues <pulkomandy@pulkomandy.tk>
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>Adrien Destugues has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/7621?usp=email">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">cmedia: enable \
-Werror<br><br>Errors are now enabled for all audio drivers.<br><br>Change-Id: \
Ia4e986f0ed8965376c3bbefc3d9f04bcd68ad561<br>---<br>M \
build/jam/ArchitectureRules<br>M src/add-ons/kernel/drivers/audio/cmedia/cm.c<br>M \
src/add-ons/kernel/drivers/audio/cmedia/cm_private.h<br>M \
src/add-ons/kernel/drivers/audio/cmedia/mixer.c<br>M \
src/add-ons/kernel/drivers/audio/cmedia/pcm.c<br>5 files changed, 33 insertions(+), \
28 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; \
white-space: pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku \
refs/changes/21/7621/1</pre><pre style="font-family: monospace,monospace; \
white-space: pre-wrap;"><span>diff --git a/build/jam/ArchitectureRules \
b/build/jam/ArchitectureRules</span><br><span>index 7717d3c..fddfea5 \
100644</span><br><span>--- a/build/jam/ArchitectureRules</span><br><span>+++ \
b/build/jam/ArchitectureRules</span><br><span>@@ -674,21 +674,12 @@</span><br><span> \
EnableWerror src add-ons kernel console ;</span><br><span> EnableWerror src add-ons \
kernel cpu ;</span><br><span> EnableWerror src add-ons kernel debugger \
;</span><br><span style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel \
drivers audio ac97 ;</span><br><span style="color: hsl(0, 100%, \
40%);">-# EnableWerror src add-ons kernel drivers audio cmedia ;</span><br><span \
style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel drivers audio \
echo ;</span><br><span style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons \
kernel drivers audio emuxki ;</span><br><span style="color: hsl(0, 100%, \
40%);">- EnableWerror src add-ons kernel drivers audio generic ;</span><br><span \
style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel drivers audio hda \
;</span><br><span style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel \
drivers audio ice1712 ;</span><br><span style="color: hsl(0, 100%, \
40%);">- EnableWerror src add-ons kernel drivers audio null ;</span><br><span \
style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel drivers audio \
sb16 ;</span><br><span style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons \
kernel drivers audio usb ;</span><br><span style="color: hsl(0, 100%, \
40%);">- EnableWerror src add-ons kernel drivers audio virtio ;</span><br><span \
style="color: hsl(120, 100%, 40%);">+ EnableWerror src add-ons kernel drivers audio \
;</span><br><span> EnableWerror src add-ons kernel drivers bluetooth \
;</span><br><span> EnableWerror src add-ons kernel drivers bus ;</span><br><span> \
EnableWerror src add-ons kernel drivers common ;</span><br><span> EnableWerror src \
add-ons kernel drivers disk ;</span><br><span style="color: hsl(120, 100%, \
40%);">+# EnableWerror src add-ons kernel drivers display ;</span><br><span> \
EnableWerror src add-ons kernel drivers dvb ;</span><br><span> # EnableWerror src \
add-ons kernel drivers graphics ;</span><br><span> EnableWerror src add-ons kernel \
drivers graphics intel_extreme ;</span><br><span>@@ -731,10 +722,11 \
@@</span><br><span> EnableWerror src add-ons kernel drivers network wwan \
;</span><br><span> EnableWerror src add-ons kernel drivers ports ;</span><br><span> \
EnableWerror src add-ons kernel drivers power ;</span><br><span style="color: hsl(0, \
100%, 40%);">- EnableWerror src add-ons kernel drivers printer ;</span><br><span \
style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel drivers random \
;</span><br><span style="color: hsl(0, 100%, 40%);">- EnableWerror src add-ons kernel \
drivers tty ;</span><br><span style="color: hsl(120, 100%, 40%);">+# EnableWerror src \
add-ons kernel drivers pty ;</span><br><span style="color: hsl(120, 100%, \
40%);">+# EnableWerror src add-ons kernel drivers sensor ;</span><br><span \
style="color: hsl(120, 100%, 40%);">+# EnableWerror src add-ons kernel drivers timer \
;</span><br><span> EnableWerror src add-ons kernel drivers video ;</span><br><span \
style="color: hsl(120, 100%, 40%);">+# EnableWerror src add-ons kernel drivers wmi \
;</span><br><span> EnableWerror src add-ons kernel file_systems bfs \
;</span><br><span> EnableWerror src add-ons kernel file_systems cdda \
;</span><br><span> EnableWerror src add-ons kernel file_systems ext2 \
;</span><br><span>diff --git a/src/add-ons/kernel/drivers/audio/cmedia/cm.c \
b/src/add-ons/kernel/drivers/audio/cmedia/cm.c</span><br><span>index e24dae0..ede98f2 \
100644</span><br><span>--- \
a/src/add-ons/kernel/drivers/audio/cmedia/cm.c</span><br><span>+++ \
b/src/add-ons/kernel/drivers/audio/cmedia/cm.c</span><br><span>@@ -187,6 +187,7 \
@@</span><br><span> }</span><br><span> </span><br><span> </span><br><span \
style="color: hsl(120, 100%, 40%);">+void dump_card(cmedia_pci_dev * \
card);</span><br><span> #if 0</span><br><span> void dump_card(cmedia_pci_dev * \
card)</span><br><span> {</span><br><span>@@ -285,7 +286,7 @@</span><br><span> #if \
DO_PCM</span><br><span> /* cmedia_pci DMA doesn't work when physical NULL \
isn't NULL from PCI */</span><br><span> /* this is a hack to not export bad \
devices on BeBox hardware */</span><br><span style="color: hsl(0, 100%, 40%);">- if \
((*pci->ram_address)(NULL) == NULL) {</span><br><span style="color: hsl(120, 100%, \
40%);">+ if ((*pci->ram_address)(0) == 0) {</span><br><span> \
sprintf(card->pcm.name, "audio/raw/%s", name);</span><br><span> \
names[num_names++] = card->pcm.name;</span><br><span> \
sprintf(card->pcm.oldname, "audio/old/%s", name);</span><br><span>@@ \
-401,7 +402,7 @@</span><br><span> ddprintf(("cmedia_pci: successfully found or \
created low area!\n"));</span><br><span> card->low_size = \
low_size;</span><br><span> card->low_mem = addr;</span><br><span style="color: \
hsl(0, 100%, 40%);">- card->low_phys = (vuchar \
*)(addr_t)where.address;</span><br><span style="color: hsl(120, 100%, \
40%);">+ card->low_phys = where.address;</span><br><span> card->map_low = \
curarea;</span><br><span> return B_OK;</span><br><span> }</span><br><span>@@ -486,10 \
+487,11 @@</span><br><span> }</span><br><span> dprintf("%s: enhanced registers \
at 0x%x\n", cards[ix].name,</span><br><span> \
cards[ix].enhanced);</span><br><span style="color: hsl(0, 100%, \
40%);">- dprintf("%s: open %ld dma_a at 0x%x dma_c 0x%x\n", \
cards[ix].pcm.name,</span><br><span style="color: hsl(120, 100%, \
40%);">+ dprintf("%s: open %" B_PRId32 " dma_a at 0x%x dma_c \
0x%x\n", cards[ix].pcm.name,</span><br><span> cards[ix].pcm.open_count, \
cards[ix].pcm.dma_a, cards[ix].pcm.dma_c);</span><br><span> if \
(cards[ix].pcm.open_count) {</span><br><span style="color: hsl(0, 100%, \
40%);">- dprintf(" dma_a: 0x%lx+0x%lx dma_c: \
0x%lx+0x%lx\n",</span><br><span style="color: hsl(120, 100%, \
40%);">+ dprintf(" dma_a: 0x%" B_PRIu32 "+0x%" B_PRIu32 \
" dma_c: 0x%" B_PRIu32 "+0x%" B_PRIu32</span><br><span \
style="color: hsl(120, 100%, 40%);">+ "\n",</span><br><span> \
PCI_IO_RD_32((int)cards[ix].pcm.dma_a), \
PCI_IO_RD_32((int)cards[ix].pcm.dma_a+4),</span><br><span> \
PCI_IO_RD_32((int)cards[ix].pcm.dma_c), \
PCI_IO_RD_32((int)cards[ix].pcm.dma_c+4));</span><br><span> }</span><br><span>@@ \
-546,7 +548,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> if \
(setup_cmedia_pci(&cards[num_cards])) {</span><br><span style="color: hsl(0, \
100%, 40%);">- dprintf("Setup of C-Media %ld failed\n", \
num_cards+1);</span><br><span style="color: hsl(120, 100%, \
40%);">+ dprintf("Setup of C-Media %d failed\n", \
num_cards+1);</span><br><span> #ifdef __HAIKU__</span><br><span> \
(*pci->unreserve_device)(info.bus, info.device, info.function,</span><br><span> \
DRIVER_NAME, &cards[num_cards]);</span><br><span>diff --git \
a/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h \
b/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h</span><br><span>index \
cf6c6a4..ccc83d0 100644</span><br><span>--- \
a/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h</span><br><span>+++ \
b/src/add-ons/kernel/drivers/audio/cmedia/cm_private.h</span><br><span>@@ -20,7 +20,7 \
@@</span><br><span> #define DEVNAME 32</span><br><span> </span><br><span> \
</span><br><span style="color: hsl(0, 100%, 40%);">-#define EXPORT \
__declspec(dllexport)</span><br><span style="color: hsl(120, 100%, 40%);">+#define \
EXPORT __attribute__((visibility("default")))</span><br><span> \
</span><br><span> #if defined(__POWERPC__)</span><br><span> #define EIEIO() \
__eieio()</span><br><span>@@ -153,7 +153,7 @@</span><br><span> \
int dma_base;</span><br><span> size_t low_size; /* size of low memory \
*/</span><br><span> vuchar * low_mem;</span><br><span style="color: hsl(0, 100%, \
40%);">- vuchar * low_phys; /* physical address */</span><br><span style="color: \
hsl(120, 100%, 40%);">+ phys_addr_t low_phys; /* physical address \
*/</span><br><span> area_id map_low; /* area pointing to low memory \
*/</span><br><span> pci_info info;</span><br><span> \
midi_dev midi;</span><br><span>diff --git \
a/src/add-ons/kernel/drivers/audio/cmedia/mixer.c \
b/src/add-ons/kernel/drivers/audio/cmedia/mixer.c</span><br><span>index \
1285997..f8a5561 100644</span><br><span>--- \
a/src/add-ons/kernel/drivers/audio/cmedia/mixer.c</span><br><span>+++ \
b/src/add-ons/kernel/drivers/audio/cmedia/mixer.c</span><br><span>@@ -69,7 +69,7 \
@@</span><br><span> </span><br><span> static int</span><br><span> map_mixer(int \
selector) {</span><br><span style="color: hsl(0, 100%, 40%);">- int \
i;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32 i;</span><br><span> \
for (i = 0; i < N_MIXERS; i++)</span><br><span> if (the_mixers[i].selector == \
selector)</span><br><span> return i;</span><br><span>diff --git \
a/src/add-ons/kernel/drivers/audio/cmedia/pcm.c \
b/src/add-ons/kernel/drivers/audio/cmedia/pcm.c</span><br><span>index \
a23eb43..9d49f69 100644</span><br><span>--- \
a/src/add-ons/kernel/drivers/audio/cmedia/pcm.c</span><br><span>+++ \
b/src/add-ons/kernel/drivers/audio/cmedia/pcm.c</span><br><span>@@ -718,7 +718,6 \
@@</span><br><span> size_t len)</span><br><span> {</span><br><span> // declarations \
for SPDIF settings I/O</span><br><span style="color: hsl(0, 100%, 40%);">- static \
int32 chipinfo[] = { 0,0 };</span><br><span> uchar reg_value;</span><br><span> char \
DriverVersion[] = "1.3.2 (Jul 17, 2001)";</span><br><span> \
</span><br><span>@@ -1087,12 +1086,12 @@</span><br><span> err = \
B_OK;</span><br><span> break;</span><br><span> case \
SOUND_SET_PLAYBACK_PREFERRED_BUF_SIZE:</span><br><span style="color: hsl(0, 100%, \
40%);">- config.play_buf_size = (int32)data;</span><br><span style="color: hsl(120, \
100%, 40%);">+ config.play_buf_size = (intptr_t)data;</span><br><span> configure = \
true;</span><br><span> err = B_OK;</span><br><span> break;</span><br><span> case \
SOUND_SET_CAPTURE_PREFERRED_BUF_SIZE:</span><br><span style="color: hsl(0, 100%, \
40%);">- config.rec_buf_size = (int32)data;</span><br><span style="color: hsl(120, \
100%, 40%);">+ config.rec_buf_size = (intptr_t)data;</span><br><span> configure = \
true;</span><br><span> err = B_OK;</span><br><span> break;</span><br><span>@@ \
-1244,6 +1243,7 @@</span><br><span> // *(int32*)data.vendor_id = \
cards[0].info.vendor_id;</span><br><span> // *(int32*)data.device_id = \
cards[0].info.device_id;</span><br><span> </span><br><span style="color: hsl(120, \
100%, 40%);">+// static int32 chipinfo[] = { 0,0 };</span><br><span> // chipinfo[0] \
= cards[0].info.vendor_id;</span><br><span> *(int32 *)data = \
cards[0].info.device_id;</span><br><span> </span><br><span>@@ -1351,7 +1351,7 \
@@</span><br><span> pcm_dev * port = (pcm_dev *)cookie;</span><br><span> size_t \
to_read = *nread;</span><br><span> status_t err;</span><br><span style="color: \
hsl(0, 100%, 40%);">- int block;</span><br><span style="color: hsl(120, 100%, \
40%);">+ size_t block;</span><br><span> cpu_status cp;</span><br><span> int \
bytes_xferred;</span><br><span> void * hdrptr = data;</span><br><span>@@ -1433,7 \
+1433,7 @@</span><br><span> *nread += hdrsize;</span><br><span> hdr.capture_size \
= *nread;</span><br><span> hdr.sample_rate = \
port->config.sample_rate;</span><br><span style="color: hsl(0, 100%, 40%);">- if \
(hdrsize > sizeof(hdr)) {</span><br><span style="color: hsl(120, 100%, \
40%);">+ if ((uint32)hdrsize > sizeof(hdr)) {</span><br><span> hdrsize = \
sizeof(hdr);</span><br><span> }</span><br><span> memcpy(hdrptr, &hdr, \
hdrsize);</span><br><span>@@ -1635,7 +1635,7 @@</span><br><span> else \
{</span><br><span> atomic_add(&port->write_waiting, 1);</span><br><span> \
/* if none there, fill with silence */</span><br><span style="color: hsl(0, 100%, \
40%);">- if (port->wr_silence < port->config.play_buf_size*2) \
{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (port->wr_silence < \
(int32)port->config.play_buf_size*2) {</span><br><span> if \
(port->config.format == 0x11) {</span><br><span> memset((void *)ptr, 0x80, \
port->wr_size);</span><br><span> }</span><br><span></span><br></pre><p>To view, \
visit <a href="https://review.haiku-os.org/c/haiku/+/7621?usp=email">change 7621</a>. \
To unsubscribe, or for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/7621?usp=email"/><meta itemprop="name" \
content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
Ia4e986f0ed8965376c3bbefc3d9f04bcd68ad561 </div> <div style="display:none"> \
Gerrit-Change-Number: 7621 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: Adrien Destugues \
<pulkomandy@pulkomandy.tk> </div> <div style="display:none"> \
Gerrit-MessageType: newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic