net: add return value to packet receive handler

[qemu.git] / hw / smbus.h

diff --git a/hw/smbus.h b/hw/smbus.h
index 36977731ef66e19fc731b5d869d28e568339502c..5b6e20f91faab81f678ea22d06b63b0466175a79 100644 (file)
--- a/hw/smbus.h
+++ b/hw/smbus.h
@@ -1,8 +1,8 @@
 /*
  * QEMU SMBus API
- * 
+ *
  * Copyright (c) 2007 Arastra, Inc.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -22,13 +22,22 @@
  * THE SOFTWARE.
  */
 
-typedef struct SMBusDevice SMBusDevice;
+#include "i2c.h"
 
 struct SMBusDevice {
     /* The SMBus protocol is implemented on top of I2C.  */
     i2c_slave i2c;
 
-    /* Callbacks set by the device.  */
+    /* Remaining fields for internal use only.  */
+    int mode;
+    int data_len;
+    uint8_t data_buf[34]; /* command + len + 32 bytes of data.  */
+    uint8_t command;
+};
+
+typedef struct {
+    I2CSlaveInfo i2c;
+    void (*init)(SMBusDevice *dev);
     void (*quick_cmd)(SMBusDevice *dev, uint8_t read);
     void (*send_byte)(SMBusDevice *dev, uint8_t val);
     uint8_t (*receive_byte)(SMBusDevice *dev);
@@ -42,16 +51,9 @@ struct SMBusDevice {
        byte at a time.  The device is responsible for adding the length
        byte on block reads.  */
     uint8_t (*read_data)(SMBusDevice *dev, uint8_t cmd, int n);
+} SMBusDeviceInfo;
 
-    /* Remaining fields for internal use only.  */
-    int mode;
-    int data_len;
-    uint8_t data_buf[34]; /* command + len + 32 bytes of data.  */
-    uint8_t command;
-};
-
-/* Create a slave device.  */
-SMBusDevice *smbus_device_init(i2c_bus *bus, int address, int size);
+void smbus_register_device(const char *name, int size, SMBusDeviceInfo *info);
 
 /* Master device commands.  */
 void smbus_quick_command(i2c_bus *bus, int addr, int read);
@@ -64,7 +66,3 @@ void smbus_write_word(i2c_bus *bus, int addr, uint8_t command, uint16_t data);
 int smbus_read_block(i2c_bus *bus, int addr, uint8_t command, uint8_t *data);
 void smbus_write_block(i2c_bus *bus, int addr, uint8_t command, uint8_t *data,
                        int len);
-
-/* smbus_eeprom.c */
-void smbus_eeprom_device_init(i2c_bus *bus, uint8_t addr, uint8_t *buf);
-