Merge branch 'can-usb1' into spican1

[lincan.git] / lincan / include / main.h

diff --git a/lincan/include/main.h b/lincan/include/main.h
index c82935bcf543cdeb95ea641dd10d7fccef2dac50..582d895e09efa924de6465353825c46aacaf5840 100644 (file)
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -106,6 +106,7 @@ struct candevice_t {
        int nr_all_chips;
        int nr_82527_chips;
        int nr_sja1000_chips;
+       int nr_mcp2515_chips;
        can_spinlock_t device_lock;
        struct canchip_t *chip[MAX_HW_CHIPS];
 
@@ -192,6 +193,13 @@ struct canchip_t {
        void (*write_register)(unsigned data, can_ioptr_t address);
        unsigned (*read_register)(can_ioptr_t address);
 
+       /* SPI / mcp2515 specific */
+       int  (*spi_acquire_bus)(struct candevice_t *candev, short channel, int block);
+       void (*spi_release_bus)(struct candevice_t *candev, short channel);
+       int  (*spi_transfer)(struct candevice_t *candev, void *tx, void *rx, uint16_t len);
+       short spi_channel;
+
+
        void *chip_data;
 
        unsigned short sja_cdr_reg; /* sja1000 only! */
@@ -330,6 +338,9 @@ struct hwspecops_t {
        int (*program_irq)(struct candevice_t *candev);
        void (*write_register)(unsigned data, can_ioptr_t address);
        unsigned (*read_register)(can_ioptr_t address);
+       int (*spi_acquire_bus)(struct candevice_t *candev, short channel, int block);
+       void (*spi_release_bus)(struct candevice_t *candev, short channel);
+       int (*spi_transfer)(struct candevice_t *candev, void *tx, void *rx, uint16_t len);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
        void (*release_device)(struct kref *refcount);
@@ -362,6 +373,7 @@ struct hwspecops_t {
  * @stop_chip: stops chip message processing
  * @irq_handler: interrupt service routine
  * @irq_accept: optional fast irq accept routine responsible for blocking further interrupts
+ * @get_info: retrieve chp-specifc info for display in proc fs
  */
 struct chipspecops_t {
        int (*chip_config)(struct canchip_t *chip);
@@ -394,6 +406,8 @@ struct chipspecops_t {
        int (*stop_chip)(struct canchip_t *chip);
        int (*irq_handler)(int irq, struct canchip_t *chip);
        int (*irq_accept)(int irq, struct canchip_t *chip);
+       int (*reset_chip)(struct canchip_t *chip);
+       int (*get_info)(struct canchip_t *chip, char *buf);
 };
 
 struct mem_addr {
@@ -489,6 +503,23 @@ extern inline unsigned can_read_reg(const struct canchip_t *chip, unsigned reg_o
        return chip->read_register(address_to_read);
 }
 
+extern inline int can_spi_transfer(struct canchip_t *chip, void *tx, void *rx, uint16_t len)
+{
+       return chip->spi_transfer(chip->hostdevice, tx, rx, len);
+}
+
+extern inline int can_spi_acquire_bus(struct canchip_t *chip, int block)
+{
+       return chip->spi_acquire_bus(chip->hostdevice, chip->spi_channel, block);
+}
+
+extern inline void can_spi_release_bus(struct canchip_t *chip)
+{
+       chip->spi_release_bus(chip->hostdevice, chip->spi_channel);
+}
+
+
+
 extern inline void canobj_write_reg(const struct canchip_t *chip, const struct msgobj_t *obj,
                                unsigned char data, unsigned reg_offs)
 {