diff --git a/hw/ipad1g.c b/hw/ipad1g.c index 7adc0436b..11b722216 100644 --- a/hw/ipad1g.c +++ b/hw/ipad1g.c @@ -382,8 +382,8 @@ static void ipad1g_init(ram_addr_t ram_size, s5l8930_state *cpu; uint32_t llb_size, vrom_size; ram_addr_t phys_flash, ramoff; - //target_phys_addr_t llb_base = LLB_LOAD_ADDR; - target_phys_addr_t llb_base = IBOOT_LOAD_ADDR; + target_phys_addr_t llb_base = LLB_LOAD_ADDR; + //target_phys_addr_t llb_base = IBOOT_LOAD_ADDR; //target_phys_addr_t llb_base = 0; target_phys_addr_t vrom_base = 0x000000000; diff --git a/hw/s5l8930_spi.c b/hw/s5l8930_spi.c index f52415c8a..361a323e2 100644 --- a/hw/s5l8930_spi.c +++ b/hw/s5l8930_spi.c @@ -73,7 +73,7 @@ static uint32_t s5l8930_spi_mm_read(void *opaque, target_phys_addr_t offset) { S5L8930SPIState *s = (S5L8930SPIState *)opaque; - fprintf(stderr, "%s: base 0x%08x offset 0x%08x\n", __func__, s->base, offset); +// fprintf(stderr, "%s: base 0x%08x offset 0x%08x\n", __func__, s->base, offset); switch (offset) { case SPI_CONTROL: diff --git a/hw/tcp_usb.c b/hw/tcp_usb.c index faac08810..096f8de96 100644 --- a/hw/tcp_usb.c +++ b/hw/tcp_usb.c @@ -31,7 +31,7 @@ #include "usb.h" #include "tcp_usb.h" -//#define DEBUG_TCP_USB +#define DEBUG_TCP_USB void tcp_usb_init(tcp_usb_state_t *_state, tcp_usb_callback_t _cb, tcp_usb_closed_t _closed, void *_arg) { @@ -121,7 +121,7 @@ static void tcp_usb_callback(tcp_usb_state_t *state, int _can_read, int _can_wri // Fall through case tcp_usb_read_request: - debug_printf("%s: tcp_usb_read_request\n", __func__); +// debug_printf("%s: tcp_usb_read_request\n", __func__); if(state->amount_done < sizeof(*state->header)) { @@ -335,7 +335,7 @@ static void tcp_usb_callback(tcp_usb_state_t *state, int _can_read, int _can_wri // Fall through case tcp_usb_read_response: - debug_printf("%s: tcp_usb_read_response\n", __func__); +// debug_printf("%s: tcp_usb_read_response\n", __func__); if(state->amount_done < sizeof(*state->header)) { diff --git a/hw/tcp_usb_bus.c b/hw/tcp_usb_bus.c index 6ee8de3d5..9b3a43e12 100644 --- a/hw/tcp_usb_bus.c +++ b/hw/tcp_usb_bus.c @@ -28,13 +28,9 @@ #define DEVICE_NAME "tcp_usb_bus" -//#define TCP_USB_BUS_DEBUG +#define TCP_USB_BUS_DEBUG -#ifdef TCP_USB_BUS_DEBUG # define debug_printf(args...) fprintf(stderr, DEVICE_NAME ": " args); -#else -# define debug_printf(args...) -#endif typedef struct _tcp_bus_state @@ -357,6 +353,7 @@ static void *tcp_bus_thread(void *_arg) (tcp_passthrough_state_t*)usb_create(bus, "tcp_usb_passthrough"); dev->parent = state; dev->tcp = newState; + dev->dev.speed = 0x0400; newState->callback_arg = dev; qdev_init_nofail(&dev->dev.qdev); diff --git a/hw/usb_synopsys.c b/hw/usb_synopsys.c index b1cf7fef3..93dacb651 100644 --- a/hw/usb_synopsys.c +++ b/hw/usb_synopsys.c @@ -417,7 +417,7 @@ static int synopsys_usb_tcp_callback(tcp_usb_state_t *_state, void *_arg, tcp_us if(txfs + txfz > sizeof(state->fifos)) hw_error("usb_synopsys: USB transfer would overflow FIFO buffer!\n"); - //printf("USB: Starting IN transfer on EP %d (%d)...\n", ep, amtDone); + printf("USB: Starting IN transfer on EP %d (%d)...\n", ep, amtDone); if(amtDone > 0) { @@ -486,7 +486,6 @@ static int synopsys_usb_tcp_callback(tcp_usb_state_t *_state, void *_arg, tcp_us if(_hdr->flags & tcp_usb_setup) { - /* printf("USB: Setup %02x %02x %02x %02x %02x %02x %02x %02x\n", state->fifos[0], state->fifos[1], @@ -496,7 +495,6 @@ static int synopsys_usb_tcp_callback(tcp_usb_state_t *_state, void *_arg, tcp_us state->fifos[5], state->fifos[6], state->fifos[7]); - */ eps->interrupt_status |= USB_EPINT_SetUp; } else @@ -763,7 +761,7 @@ static void synopsys_usb_write(void *_arg, target_phys_addr_t _addr, uint32_t _v { synopsys_usb_state *state = _arg; - //printf("USB: Write 0x%08x to 0x%08x.\n", _val, _addr); + printf("USB: Write 0x%08x to 0x%08x.\n", _val, _addr); switch(_addr) { @@ -1027,10 +1025,10 @@ void register_synopsys_usb(target_phys_addr_t _addr, qemu_irq _irq, uint32_t _hw synopsys_usb_state *state = DO_UPCAST(synopsys_usb_state, busdev, sysbus_from_qdev(dev)); - state->ghwcfg1 = _hwcfg[0]; - state->ghwcfg2 = _hwcfg[1]; - state->ghwcfg3 = _hwcfg[2]; - state->ghwcfg4 = _hwcfg[3]; + state->ghwcfg1 = 0xdeadbeef; + state->ghwcfg2 = 0xdeadbeef; + state->ghwcfg3 = 0xdeadbeef; + state->ghwcfg4 = 0xdeadbeef; qdev_init_nofail(dev); diff --git a/skin/skin_image.c b/skin/skin_image.c index 6b116c799..63428a944 100644 --- a/skin/skin_image.c +++ b/skin/skin_image.c @@ -398,7 +398,7 @@ void *skin_loadpng(const char *fn, unsigned *_width, unsigned *_height) case PNG_COLOR_TYPE_GRAY: printf("\n"); if(bitdepth < 8) { - png_set_gray_1_2_4_to_8(p); + //png_set_gray_1_2_4_to_8(p); } default: