--- zzzz-none-000/linux-5.15.111/include/linux/ti_wilink_st.h 2023-05-11 14:00:40.000000000 +0000 +++ puma7-arm-6670-761/linux-5.15.111/include/linux/ti_wilink_st.h 2024-02-07 09:28:07.000000000 +0000 @@ -9,6 +9,16 @@ * Author: Pavan Savoy */ +/* + * Includes Intel Corporation's changes/modifications dated: 2017. + * Changed/modified portions - Copyright (c) 2017, Intel Corporation. + */ + +/* + * Includes Intel Corporation's changes/modifications dated: 2017. + * Changed/modified portions - Copyright (c) 2017, Intel Corporation. + */ + #ifndef TI_WILINK_ST_H #define TI_WILINK_ST_H @@ -58,7 +68,7 @@ enum proto_type type; long (*recv) (void *, struct sk_buff *); unsigned char (*match_packet) (const unsigned char *data); - void (*reg_complete_cb) (void *, int data); + void (*reg_complete_cb) (void *, char data); long (*write) (struct sk_buff *skb); void *priv_data; @@ -69,7 +79,7 @@ unsigned char len_size; unsigned char reserve; }; - +#if defined(__KERNEL__) extern long st_register(struct st_proto_s *); extern long st_unregister(struct st_proto_s *); @@ -145,7 +155,6 @@ unsigned long ll_state; void *kim_data; struct tty_struct *tty; - struct work_struct work_write_wakeup; }; /* @@ -249,16 +258,16 @@ struct completion kim_rcvd, ldisc_installed; char resp_buffer[30]; const struct firmware *fw_entry; - unsigned nshutdown; + long nshutdown; unsigned long rx_state; unsigned long rx_count; struct sk_buff *rx_skb; struct st_data_s *core_data; struct chip_version version; unsigned char ldisc_install; - unsigned char dev_name[UART_DEV_NAME_LEN + 1]; - unsigned flow_cntrl; - unsigned baud_rate; + unsigned char dev_name[UART_DEV_NAME_LEN]; + unsigned char flow_cntrl; + unsigned long baud_rate; }; /** @@ -424,10 +433,10 @@ * */ struct ti_st_plat_data { - u32 nshutdown_gpio; + long nshutdown_gpio; unsigned char dev_name[UART_DEV_NAME_LEN]; /* uart name */ - u32 flow_cntrl; /* flow control flag */ - u32 baud_rate; + unsigned char flow_cntrl; /* flow control flag */ + unsigned long baud_rate; int (*suspend)(struct platform_device *, pm_message_t); int (*resume)(struct platform_device *); int (*chip_enable) (struct kim_data_s *); @@ -435,5 +444,5 @@ int (*chip_asleep) (struct kim_data_s *); int (*chip_awake) (struct kim_data_s *); }; - +#endif /*KERNEL*/ #endif /* TI_WILINK_ST_H */