41742927ee
Currently the bitbang_i2c_init() function allocates a bitbang_i2c_interface struct which it returns. This is unfortunate because it means that if the function is used from a DeviceState init method then the memory will be leaked by an "init then delete" cycle, as used by the qmp/hmp commands that list device properties. Since three out of four of the uses of this function are in device init methods, switch the function to do an in-place initialization of a struct that can be embedded in the device state struct of the caller. This fixes LeakSanitizer leak warnings that have appeared in the patchew configuration (which only tries to run the sanitizers for the x86_64-softmmu target) now that we use the bitbang-i2c code in an x86-64 config. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> Tested-by: BALATON Zoltan <balaton@eik.bme.hu> Acked-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20190702163844.20458-1-peter.maydell@linaro.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
51 lines
1,016 B
C
51 lines
1,016 B
C
#ifndef BITBANG_I2C_H
|
|
#define BITBANG_I2C_H
|
|
|
|
#include "hw/i2c/i2c.h"
|
|
|
|
typedef struct bitbang_i2c_interface bitbang_i2c_interface;
|
|
|
|
#define BITBANG_I2C_SDA 0
|
|
#define BITBANG_I2C_SCL 1
|
|
|
|
typedef enum bitbang_i2c_state {
|
|
STOPPED = 0,
|
|
SENDING_BIT7,
|
|
SENDING_BIT6,
|
|
SENDING_BIT5,
|
|
SENDING_BIT4,
|
|
SENDING_BIT3,
|
|
SENDING_BIT2,
|
|
SENDING_BIT1,
|
|
SENDING_BIT0,
|
|
WAITING_FOR_ACK,
|
|
RECEIVING_BIT7,
|
|
RECEIVING_BIT6,
|
|
RECEIVING_BIT5,
|
|
RECEIVING_BIT4,
|
|
RECEIVING_BIT3,
|
|
RECEIVING_BIT2,
|
|
RECEIVING_BIT1,
|
|
RECEIVING_BIT0,
|
|
SENDING_ACK,
|
|
SENT_NACK
|
|
} bitbang_i2c_state;
|
|
|
|
struct bitbang_i2c_interface {
|
|
I2CBus *bus;
|
|
bitbang_i2c_state state;
|
|
int last_data;
|
|
int last_clock;
|
|
int device_out;
|
|
uint8_t buffer;
|
|
int current_addr;
|
|
};
|
|
|
|
/**
|
|
* bitbang_i2c_init: in-place initialize the bitbang_i2c_interface struct
|
|
*/
|
|
void bitbang_i2c_init(bitbang_i2c_interface *s, I2CBus *bus);
|
|
int bitbang_i2c_set(bitbang_i2c_interface *i2c, int line, int level);
|
|
|
|
#endif
|