nforcepc.cpp: add placeholder for Asus AS99127F chip (nw)

Also small corrections to xbox_pci.cpp

src/mame/drivers/nforcepc.cpp

@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(CRUSH11, crush11_host_device, "crush11", "NVIDIA Corporation
 void crush11_host_device::config_map(address_map &map)
 {
 	pci_host_device::config_map(map);
-	map(0x50, 0x50).rw(FUNC(crush11_host_device::test_r), FUNC(crush11_host_device::test_w));
+	map(0xf0, 0xf0).rw(FUNC(crush11_host_device::test_r), FUNC(crush11_host_device::test_w));
 }
 
 crush11_host_device::crush11_host_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@@ -93,7 +93,7 @@ void crush11_host_device::map_extra(uint64_t memory_window_start, uint64_t memor
 
 READ8_MEMBER(crush11_host_device::test_r)
 {
-	return 0;
+	return 4;
 }
 
 WRITE8_MEMBER(crush11_host_device::test_w)
@@ -112,13 +112,13 @@ smbus_logger_device::smbus_logger_device(const machine_config &mconfig, const ch
 
 int smbus_logger_device::execute_command(int command, int rw, int data)
 {
-	if (rw == 1) // read
+	if (rw == 1)
 	{
-		logerror("smbus read  %02x %d %02x\n", command, rw, buffer[command]);
+		logerror("smbus read from %02x R %02x\n", command, buffer[command]);
 		return buffer[command];
 	}
 	buffer[command] = (uint8_t)data;
-	logerror("smbus write %02x %d %02d\n", command, rw, data);
+	logerror("smbus write to %02x W %02x\n", command, data);
 	return 0;
 }
 
@@ -131,6 +131,80 @@ void smbus_logger_device::device_reset()
 {
 }
 
+// Asus AS99127F chip
+
+DEFINE_DEVICE_TYPE(AS99127F, as99127f_device, "as99127f", "Asus AS99127F")
+
+as99127f_device::as99127f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, AS99127F, tag, owner, clock)
+{
+}
+
+int as99127f_device::execute_command(int command, int rw, int data)
+{
+	if (rw == 1)
+	{
+		logerror("smbus read from %02x R %02x\n", command, buffer[command]);
+		return buffer[command];
+	}
+	buffer[command] = (uint8_t)data;
+	logerror("smbus write to %02x W %02x\n", command, data);
+	return 0;
+}
+
+void as99127f_device::device_start()
+{
+	memset(buffer, 0, sizeof(buffer));
+}
+
+DEFINE_DEVICE_TYPE(AS99127F_SENSOR2, as99127f_sensor2_device, "as99127f_sensor2", "Asus AS99127F temperature sensor 2")
+
+as99127f_sensor2_device::as99127f_sensor2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, AS99127F_SENSOR2, tag, owner, clock)
+{
+}
+
+int as99127f_sensor2_device::execute_command(int command, int rw, int data)
+{
+	if (rw == 1)
+	{
+		logerror("smbus read from %02x R %02x\n", command, buffer[command]);
+		return buffer[command];
+	}
+	buffer[command] = (uint8_t)data;
+	logerror("smbus write to %02x W %02x\n", command, data);
+	return 0;
+}
+
+void as99127f_sensor2_device::device_start()
+{
+	memset(buffer, 0, sizeof(buffer));
+}
+
+DEFINE_DEVICE_TYPE(AS99127F_SENSOR3, as99127f_sensor3_device, "as99127f_sensor3", "Asus AS99127F temperature sensor 3")
+
+as99127f_sensor3_device::as99127f_sensor3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, AS99127F_SENSOR2, tag, owner, clock)
+{
+}
+
+int as99127f_sensor3_device::execute_command(int command, int rw, int data)
+{
+	if (rw == 1)
+	{
+		logerror("smbus read from %02x R %02x\n", command, buffer[command]);
+		return buffer[command];
+	}
+	buffer[command] = (uint8_t)data;
+	logerror("smbus write to %02x W %02x\n", command, data);
+	return 0;
+}
+
+void as99127f_sensor3_device::device_start()
+{
+	memset(buffer, 0, sizeof(buffer));
+}
+
 /*
   Machine state
 */
@@ -162,17 +236,20 @@ private:
 
 	required_device<cpu_device> m_maincpu;
 	required_device<mcpx_isalpc_device> isalpc;
+	required_device<as99127f_device> m_as99127f;
 };
 
 nforcepc_state::nforcepc_state(const machine_config &mconfig, device_type type, const char *tag) :
 	driver_device(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
-	isalpc(*this, ":pci:01.0")
+	isalpc(*this, ":pci:01.0"),
+	m_as99127f(*this, ":pci:01.1:2d")
 {
 }
 
 void nforcepc_state::machine_start()
 {
+	m_as99127f->get_buffer()[0x4f] = 0x12;
 }
 
 void nforcepc_state::machine_reset()
@@ -194,7 +271,6 @@ WRITE8_MEMBER(nforcepc_state::boot_state_award_w)
 			break;
 		}
 	logerror("Boot state %02x - %s\n", data, desc);
-
 }
 
 IRQ_CALLBACK_MEMBER(nforcepc_state::irq_callback)
@@ -238,9 +314,9 @@ void nforcepc_state::nforcepc(machine_config &config)
 	isa.interrupt_output().set(FUNC(nforcepc_state::maincpu_interrupt));
 	MCPX_SMBUS(config, ":pci:01.1", 0); // 10de:01b4 NVIDIA Corporation nForce PCI System Management (SMBus)
 	SMBUS_LOGGER(config, ":pci:01.1:08", 0);
-	SMBUS_LOGGER(config, ":pci:01.1:2d", 0);
+	AS99127F(config, ":pci:01.1:2d", 0);
-	SMBUS_LOGGER(config, ":pci:01.1:48", 0);
+	AS99127F_SENSOR2(config, ":pci:01.1:48", 0);
-	SMBUS_LOGGER(config, ":pci:01.1:49", 0);
+	AS99127F_SENSOR3(config, ":pci:01.1:49", 0);
 	/*10de:01c2 NVIDIA Corporation nForce USB Controller
 	10de:01c2 NVIDIA Corporation nForce USB Controller
 	10de:01b0 NVIDIA Corporation nForce Audio Processing Unit

src/mame/includes/nforcepc.h

@@ -51,6 +51,7 @@ class smbus_logger_device : public device_t, public smbus_interface
 public:
 	smbus_logger_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	virtual int execute_command(int command, int rw, int data) override;
+	uint8_t *get_buffer() { return buffer; }
 
 protected:
 	virtual void device_start() override;
@@ -62,4 +63,55 @@ private:
 
 DECLARE_DEVICE_TYPE(SMBUS_LOGGER, smbus_logger_device)
 
+// Asus AS99127F chip
+// It answerst to three smbus addresses, by default 0x2d 0x48 0x49
+
+class as99127f_device : public device_t, public smbus_interface
+{
+public:
+	as99127f_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual int execute_command(int command, int rw, int data) override;
+	uint8_t *get_buffer() { return buffer; }
+
+protected:
+	virtual void device_start() override;
+
+private:
+	uint8_t buffer[0xff];
+};
+
+DECLARE_DEVICE_TYPE(AS99127F, as99127f_device)
+
+class as99127f_sensor2_device : public device_t, public smbus_interface
+{
+public:
+	as99127f_sensor2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual int execute_command(int command, int rw, int data) override;
+	uint8_t *get_buffer() { return buffer; }
+
+protected:
+	virtual void device_start() override;
+
+private:
+	uint8_t buffer[0xff];
+};
+
+DECLARE_DEVICE_TYPE(AS99127F_SENSOR2, as99127f_sensor2_device)
+
+class as99127f_sensor3_device : public device_t, public smbus_interface
+{
+public:
+	as99127f_sensor3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual int execute_command(int command, int rw, int data) override;
+	uint8_t *get_buffer() { return buffer; }
+
+protected:
+	virtual void device_start() override;
+
+private:
+	uint8_t buffer[0xff];
+};
+
+DECLARE_DEVICE_TYPE(AS99127F_SENSOR3, as99127f_sensor3_device)
+
 #endif

src/mame/includes/xbox_pci.h

@@ -69,8 +69,8 @@ public:
 	uint32_t acknowledge();
 	void debug_generate_irq(int irq, int state);
 
-	DECLARE_READ32_MEMBER(lpc_r);
+	DECLARE_READ32_MEMBER(acpi_r);
-	DECLARE_WRITE32_MEMBER(lpc_w);
+	DECLARE_WRITE32_MEMBER(acpi_w);
 	DECLARE_WRITE8_MEMBER(boot_state_w);
 
 	DECLARE_WRITE_LINE_MEMBER(irq1);

src/mame/machine/xbox_pci.cpp

@@ -86,14 +86,14 @@ DEFINE_DEVICE_TYPE(MCPX_ISALPC, mcpx_isalpc_device, "mcpx_isalpc", "MCPX HUB Int
 
 void mcpx_isalpc_device::lpc_io(address_map &map)
 {
-	map(0x00000000, 0x000000ff).rw(FUNC(mcpx_isalpc_device::lpc_r), FUNC(mcpx_isalpc_device::lpc_w));
+	map(0x00000000, 0x000000ff).rw(FUNC(mcpx_isalpc_device::acpi_r), FUNC(mcpx_isalpc_device::acpi_w));
 }
 
 void mcpx_isalpc_device::internal_io_map(address_map &map)
 {
 	map(0x0020, 0x0023).rw("pic8259_1", FUNC(pic8259_device::read), FUNC(pic8259_device::write));
 	map(0x0040, 0x0043).rw("pit8254", FUNC(pit8254_device::read), FUNC(pit8254_device::write));
-	map(0x0070, 0x0073).rw("rtc", FUNC(ds12885ext_device::read), FUNC(ds12885ext_device::write));
+	map(0x0070, 0x0073).rw("rtc", FUNC(ds12885ext_device::read_extended), FUNC(ds12885ext_device::write_extended));
 	map(0x0080, 0x0080).w(FUNC(mcpx_isalpc_device::boot_state_w));
 	map(0x00a0, 0x00a3).rw("pic8259_2", FUNC(pic8259_device::read), FUNC(pic8259_device::write));
 }
@@ -162,13 +162,15 @@ void mcpx_isalpc_device::device_add_mconfig(machine_config &config)
 	*/
 }
 
-READ32_MEMBER(mcpx_isalpc_device::lpc_r)
+READ32_MEMBER(mcpx_isalpc_device::acpi_r)
 {
+	logerror("Acpi read from %04X mask %08X\n", bank_infos[0].adr + offset, mem_mask);
 	return 0;
 }
 
-WRITE32_MEMBER(mcpx_isalpc_device::lpc_w)
+WRITE32_MEMBER(mcpx_isalpc_device::acpi_w)
 {
+	logerror("Acpi write %08X to %04X mask %08X\n", data, bank_infos[0].adr + offset, mem_mask);
 }
 
 WRITE8_MEMBER(mcpx_isalpc_device::boot_state_w)