Merge changes I55f26e97,Iec044d31
* changes:
android-emu: Fix -Wunused-function warning
android-emu: Fix -Wunused-parameter warnings
diff --git a/android-emu/android/base/ring_buffer.c b/android-emu/android/base/ring_buffer.c
index 527d2ea..fb6845f 100644
--- a/android-emu/android/base/ring_buffer.c
+++ b/android-emu/android/base/ring_buffer.c
@@ -407,19 +407,10 @@
void ring_buffer_yield() { }
-static void ring_buffer_sleep() {
-#ifdef _WIN32
- Sleep(2);
-#else
- usleep(2000);
-#endif
-}
-
bool ring_buffer_wait_write(
const struct ring_buffer* r,
const struct ring_buffer_view* v,
- uint32_t bytes,
- uint64_t timeout_us) {
+ uint32_t bytes) {
bool can_write =
v ? ring_buffer_view_can_write(r, v, bytes) :
@@ -438,8 +429,7 @@
bool ring_buffer_wait_read(
const struct ring_buffer* r,
const struct ring_buffer_view* v,
- uint32_t bytes,
- uint64_t timeout_us) {
+ uint32_t bytes) {
bool can_read =
v ? ring_buffer_view_can_read(r, v, bytes) :
@@ -457,7 +447,6 @@
}
static uint32_t get_step_size(
- struct ring_buffer* r,
struct ring_buffer_view* v,
uint32_t bytes) {
@@ -491,7 +480,7 @@
uint32_t abort_value,
const volatile uint32_t* abort_ptr) {
- uint32_t candidate_step = get_step_size(r, v, bytes);
+ uint32_t candidate_step = get_step_size(v, bytes);
uint32_t processed = 0;
uint8_t* dst = (uint8_t*)data;
@@ -502,7 +491,7 @@
}
long processed_here = 0;
- ring_buffer_wait_write(r, v, candidate_step, (uint64_t)(-1));
+ ring_buffer_wait_write(r, v, candidate_step);
if (v) {
processed_here = ring_buffer_view_write(r, v, dst + processed, candidate_step, 1);
@@ -528,7 +517,7 @@
uint32_t abort_value,
const volatile uint32_t* abort_ptr) {
- uint32_t candidate_step = get_step_size(r, v, bytes);
+ uint32_t candidate_step = get_step_size(v, bytes);
uint32_t processed = 0;
uint8_t* dst = (uint8_t*)data;
@@ -540,7 +529,7 @@
}
long processed_here = 0;
- ring_buffer_wait_read(r, v, candidate_step, (uint64_t)(-1));
+ ring_buffer_wait_read(r, v, candidate_step);
if (v) {
processed_here = ring_buffer_view_read(r, v, dst + processed, candidate_step, 1);
diff --git a/android-emu/android/base/ring_buffer.h b/android-emu/android/base/ring_buffer.h
index 390a758..7007a87 100644
--- a/android-emu/android/base/ring_buffer.h
+++ b/android-emu/android/base/ring_buffer.h
@@ -116,13 +116,11 @@
bool ring_buffer_wait_write(
const struct ring_buffer* r,
const struct ring_buffer_view* v,
- uint32_t bytes,
- uint64_t timeout_us);
+ uint32_t bytes);
bool ring_buffer_wait_read(
const struct ring_buffer* r,
const struct ring_buffer_view* v,
- uint32_t bytes,
- uint64_t timeout_us);
+ uint32_t bytes);
// read/write fully, blocking if there is nothing to read/write.
void ring_buffer_write_fully(
