From 647995dd2796abb99462a6d6c8f98dcb0632ede9 Mon Sep 17 00:00:00 2001 From: espes Date: Fri, 26 Oct 2012 18:16:32 +1100 Subject: [PATCH] xbox: smbus word reads --- hw/amd_smbus.c | 10 +++++----- hw/amd_smbus.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/amd_smbus.c b/hw/amd_smbus.c index c619f45470..36ca096116 100644 --- a/hw/amd_smbus.c +++ b/hw/amd_smbus.c @@ -89,7 +89,7 @@ static void amd756_smb_transaction(AMD756SMBus *s) uint16_t val; val = smbus_read_word(bus, addr, cmd); s->smb_data0 = val; - //s->smb_data1 = val >> 8; + s->smb_data1 = val >> 8; } else { smbus_write_word(bus, addr, cmd, s->smb_data0); } @@ -171,9 +171,9 @@ void amd756_smb_ioport_writeb(void *opaque, uint32_t addr, uint32_t val) case SMB_HOST_DATA: s->smb_data0 = val; break; - /*case SMBHSTDAT1: + case SMB_HOST_DATA+1: s->smb_data1 = val; - break;*/ + break; case SMB_HOST_BLOCK_DATA: s->smb_data[s->smb_index++] = val; if (s->smb_index > 31) @@ -207,9 +207,9 @@ uint32_t amd756_smb_ioport_readb(void *opaque, uint32_t addr) case SMB_HOST_DATA: val = s->smb_data0; break; - /*case SMBHSTDAT1: + case SMB_HOST_DATA+1: val = s->smb_data1; - break;*/ + break; case SMB_HOST_BLOCK_DATA: val = s->smb_data[s->smb_index++]; if (s->smb_index > 31) diff --git a/hw/amd_smbus.h b/hw/amd_smbus.h index 6bf535798c..d9921abe60 100644 --- a/hw/amd_smbus.h +++ b/hw/amd_smbus.h @@ -9,7 +9,7 @@ typedef struct AMD756SMBus { uint8_t smb_cmd; uint8_t smb_addr; uint8_t smb_data0; - //uint8_t smb_data1; + uint8_t smb_data1; uint8_t smb_data[32]; uint8_t smb_index;