gwj / at91sam9263 · Commits

Commit 5a1237c45f8ae84da2cbffe07a344e29952c689b

Authored by balrog
1 parent 549444e1

Don't define HIGH_LATENCY for ARM, this was a workaround for an ALSA problem. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2766 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
Makefile.target
  View file @5a1237c
@@ -456,7 +456,7 @@ VL_OBJS+= arm-semi.o @@ -456,7 +456,7 @@ VL_OBJS+= arm-semi.o
456 VL_OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o 456 VL_OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
457 VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o max111x.o 457 VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o max111x.o
458 VL_OBJS+= spitz.o ads7846.o ide.o serial.o nand.o $(AUDIODRV) 458 VL_OBJS+= spitz.o ads7846.o ide.o serial.o nand.o $(AUDIODRV)
459 -CPPFLAGS += -DHAS_AUDIO -DHIGH_LATENCY 459 +CPPFLAGS += -DHAS_AUDIO
460 endif 460 endif
461 ifeq ($(TARGET_BASE_ARCH), sh4) 461 ifeq ($(TARGET_BASE_ARCH), sh4)
462 VL_OBJS+= shix.o sh7750.o sh7750_regnames.o tc58128.o 462 VL_OBJS+= shix.o sh7750.o sh7750_regnames.o tc58128.o
audio/alsaaudio.c
  View file @5a1237c
@@ -57,6 +57,8 @@ static struct { @@ -57,6 +57,8 @@ static struct {
57 int period_size_out_overriden; 57 int period_size_out_overriden;
58 int verbose; 58 int verbose;
59 } conf = { 59 } conf = {
  60 +#define DEFAULT_BUFFER_SIZE 1024
  61 +#define DEFAULT_PERIOD_SIZE 256
60 #ifdef HIGH_LATENCY 62 #ifdef HIGH_LATENCY
61 .size_in_usec_in = 1, 63 .size_in_usec_in = 1,
62 .size_in_usec_out = 1, 64 .size_in_usec_out = 1,
@@ -69,8 +71,6 @@ static struct { @@ -69,8 +71,6 @@ static struct {
69 .buffer_size_out = 400000, 71 .buffer_size_out = 400000,
70 .period_size_out = 400000 / 4, 72 .period_size_out = 400000 / 4,
71 #else 73 #else
72 -#define DEFAULT_BUFFER_SIZE 1024  
73 -#define DEFAULT_PERIOD_SIZE 256  
74 .buffer_size_in = DEFAULT_BUFFER_SIZE * 4, 74 .buffer_size_in = DEFAULT_BUFFER_SIZE * 4,
75 .period_size_in = DEFAULT_PERIOD_SIZE * 4, 75 .period_size_in = DEFAULT_PERIOD_SIZE * 4,
76 .buffer_size_out = DEFAULT_BUFFER_SIZE, 76 .buffer_size_out = DEFAULT_BUFFER_SIZE,