Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7ba90fd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: usb_bam: Change the bam handle to ulong"

parents dd0d8f2b 2d9e27fa

drivers/coresight/coresight-tmc.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct tmc_etr_bam_data { 
	struct sps_pipe		*pipe;

	struct sps_connect	connect;

	uint32_t		src_pipe_idx;

	uint32_t		dest;

	unsigned long		dest;

	uint32_t		dest_pipe_idx;

	struct sps_mem_buffer	desc_fifo;

	struct sps_mem_buffer	data_fifo;

drivers/platform/msm/usb_bam.c

+1 −1
Original line number Diff line number Diff line
@@ -3210,7 +3210,7 @@ void usb_bam_set_qdss_core(const char *qdss_core) 
	strlcpy(ctx.qdss_core_name, qdss_core, USB_BAM_MAX_STR_LEN);

}



int get_bam2bam_connection_info(u8 idx, u32 *usb_bam_handle,

int get_bam2bam_connection_info(u8 idx, unsigned long *usb_bam_handle,

	u32 *usb_bam_pipe_idx, u32 *peer_pipe_idx,

	struct sps_mem_buffer *desc_fifo, struct sps_mem_buffer *data_fifo)

{

drivers/usb/gadget/u_bam.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static struct bam_portmaster { 
struct  u_bam_data_connect_info {

	u32 usb_bam_pipe_idx;

	u32 peer_pipe_idx;

	u32 usb_bam_handle;

	unsigned long usb_bam_handle;

};



struct gbam_port *bam2bam_ports[BAM2BAM_N_PORTS];

drivers/usb/gadget/u_qdss.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
struct  usb_qdss_bam_connect_info {

	u32 usb_bam_pipe_idx;

	u32 peer_pipe_idx;

	u32 usb_bam_handle;

	unsigned long usb_bam_handle;

	struct sps_mem_buffer *data_fifo;

};

include/linux/usb_bam.h

+6 −4
Original line number Diff line number Diff line
@@ -320,8 +320,9 @@ int usb_bam_disconnect_pipe(u8 idx); 
 * @return pipe index on success, negative value on error.

 */

int get_bam2bam_connection_info(u8 idx,

	u32 *usb_bam_handle, u32 *usb_bam_pipe_idx, u32 *peer_pipe_idx,

	struct sps_mem_buffer *desc_fifo, struct sps_mem_buffer *data_fifo);

	unsigned long *usb_bam_handle, u32 *usb_bam_pipe_idx,

	u32 *peer_pipe_idx, struct sps_mem_buffer *desc_fifo,

	struct sps_mem_buffer *data_fifo);



/**

 * Resets the USB BAM that has A2 pipes
@@ -453,8 +454,9 @@ static inline int usb_bam_disconnect_pipe(u8 idx) 
}



static inline int get_bam2bam_connection_info(u8 idx,

	u32 *usb_bam_handle, u32 *usb_bam_pipe_idx, u32 *peer_pipe_idx,

	struct sps_mem_buffer *desc_fifo, struct sps_mem_buffer *data_fifo)

	unsigned long *usb_bam_handle, u32 *usb_bam_pipe_idx,

	u32 *peer_pipe_idx, struct sps_mem_buffer *desc_fifo,

	struct sps_mem_buffer *data_fifo)

{

	return -ENODEV;

}