Commit a100922a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver updates from Greg KH:
 "Here is the "big" set of staging driver changes for 6.16-rc1. Included
  in here are:

   - gpib driver cleanups and updates.

     This subsystem is _almost_ ready to be merged into the main portion
     of the kernel tree. Hopefully should happen in the next kernel
     merge cycle if all goes well.

   - sm750fb driver cleanups

   - rtl8723bs driver cleanups

   - other small driver cleanups for coding style issues

  All of these have been in for over 2 weeks with no reported issues"

* tag 'staging-6.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (203 commits)
  staging: rtl8723bs: remove unnecessary braces for single statement blocks
  staging: rtl8723bs: Removed multiple blank lines of rtw_pwrctrl.c
  staging: sm750fb: rename `hw_sm750le_setBLANK`
  staging: sm750fb: rename `hw_sm750_setBLANK`
  staging: sm750fb: rename `hw_sm750_setColReg`
  staging: sm750fb: rename `hw_sm750_crtc_setMode`
  staging: sm750fb: rename `hw_sm750_crtc_checkMode`
  staging: sm750fb: rename `hw_sm750_output_setMode`
  staging: sm750fb: rename `hw_sm750le_deWait`
  staging: sm750fb: rename `hw_sm750_deWait`
  staging: sm750fb: rename `hw_sm750_initAccel`
  staging: gpib: switch to kmalloc(sizeof(*status))
  staging: gpib: Fix secondary address restriction
  staging: gpib: Fix uapi include header guard name
  staging: gpib: Avoid unused variable warning
  staging: gpib: Declare driver entry points static
  staging: gpib: Fix PCMCIA config identifier
  staging: gpib: Avoid unused variable warnings
  staging: gpib: Fix lpvo request_system_control
  staging: sm750fb: rename sm750_hw_cursor_setData2
  ...
parents 5fc6c6f2 a481f0eb

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -9147,9 +9147,10 @@ F: lib/fault-inject.c 
F:	tools/testing/fault-injection/









FBTFT Framebuffer drivers









M:	Andy Shevchenko <andy@kernel.org>









L:	dri-devel@lists.freedesktop.org









L:	linux-fbdev@vger.kernel.org









S:	Orphan









S:	Odd fixes









F:	drivers/staging/fbtft/

















FC0011 TUNER DRIVER
































drivers/staging/fbtft/Kconfig



+4
−31






























Original line number
Diff line number
Diff line







@@ -8,160 +8,136 @@ menuconfig FB_TFT







	select FB_BACKLIGHT









	select FB_SYSMEM_HELPERS_DEFERRED



















if FB_TFT



















config FB_TFT_AGM1264K_FL









	tristate "FB driver for the AGM1264K-FL LCD display"









	depends on FB_TFT









	help









	  Framebuffer support for the AGM1264K-FL LCD display (two Samsung KS0108 compatible chips)



















config FB_TFT_BD663474









	tristate "FB driver for the BD663474 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for BD663474



















config FB_TFT_HX8340BN









	tristate "FB driver for the HX8340BN LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for HX8340BN



















config FB_TFT_HX8347D









	tristate "FB driver for the HX8347D LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for HX8347D



















config FB_TFT_HX8353D









	tristate "FB driver for the HX8353D LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for HX8353D



















config FB_TFT_HX8357D









	tristate "FB driver for the HX8357D LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for HX8357D



















config FB_TFT_ILI9163









	tristate "FB driver for the ILI9163 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9163



















config FB_TFT_ILI9320









	tristate "FB driver for the ILI9320 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9320



















config FB_TFT_ILI9325









	tristate "FB driver for the ILI9325 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9325



















config FB_TFT_ILI9340









	tristate "FB driver for the ILI9340 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9340



















config FB_TFT_ILI9341









	tristate "FB driver for the ILI9341 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9341



















config FB_TFT_ILI9481









	tristate "FB driver for the ILI9481 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9481



















config FB_TFT_ILI9486









	tristate "FB driver for the ILI9486 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ILI9486



















config FB_TFT_PCD8544









	tristate "FB driver for the PCD8544 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for PCD8544



















config FB_TFT_RA8875









	tristate "FB driver for the RA8875 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for RA8875



















config FB_TFT_S6D02A1









	tristate "FB driver for the S6D02A1 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for S6D02A1



















config FB_TFT_S6D1121









	tristate "FB driver for the S6D1211 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for S6D1121



















config FB_TFT_SEPS525









	tristate "FB driver for the SEPS525 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for SEPS525









	  Say Y if you have such a display that utilizes this controller.



















config FB_TFT_SH1106









	tristate "FB driver for the SH1106 OLED Controller"









	depends on FB_TFT









	help









	  Framebuffer support for SH1106



















config FB_TFT_SSD1289









	tristate "FB driver for the SSD1289 LCD Controller"









	depends on FB_TFT









	help









	  Framebuffer support for SSD1289



















config FB_TFT_SSD1305









	tristate "FB driver for the SSD1305 OLED Controller"









	depends on FB_TFT









	help









	  Framebuffer support for SSD1305



















config FB_TFT_SSD1306









	tristate "FB driver for the SSD1306 OLED Controller"









	depends on FB_TFT









	help









	  Framebuffer support for SSD1306



















config FB_TFT_SSD1331









	tristate "FB driver for the SSD1331 LCD Controller"









	depends on FB_TFT









	help









	  Framebuffer support for SSD1331



















config FB_TFT_SSD1351









	tristate "FB driver for the SSD1351 LCD Controller"









	depends on FB_TFT









	help









	  Framebuffer support for SSD1351



















config FB_TFT_ST7735R









	tristate "FB driver for the ST7735R LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for ST7735R



















config FB_TFT_ST7789V









	tristate "FB driver for the ST7789V LCD Controller"









	depends on FB_TFT









	help









	  This enables generic framebuffer support for the Sitronix ST7789V









	  display controller. The controller is intended for small color








@@ -171,30 +147,27 @@ config FB_TFT_ST7789V

















config FB_TFT_TINYLCD









	tristate "FB driver for tinylcd.com display"









	depends on FB_TFT









	help









	  Custom Framebuffer support for tinylcd.com display



















config FB_TFT_TLS8204









	tristate "FB driver for the TLS8204 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for TLS8204



















config FB_TFT_UC1611









	tristate "FB driver for the UC1611 LCD controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for UC1611



















config FB_TFT_UC1701









	tristate "FB driver for the UC1701 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for UC1701



















config FB_TFT_UPD161704









	tristate "FB driver for the uPD161704 LCD Controller"









	depends on FB_TFT









	help









	  Generic Framebuffer support for uPD161704



















endif
























drivers/staging/gpib/agilent_82350b/agilent_82350b.c



+43
−43






























Original line number
Diff line number
Diff line







@@ -27,10 +27,10 @@ MODULE_DESCRIPTION("GPIB driver for Agilent 82350b");







static int read_transfer_counter(struct agilent_82350b_priv *a_priv);









static unsigned short read_and_clear_event_status(struct gpib_board *board);









static void set_transfer_counter(struct agilent_82350b_priv *a_priv, int count);









static int agilent_82350b_write(struct gpib_board *board, uint8_t *buffer,









static int agilent_82350b_write(struct gpib_board *board, u8 *buffer,









				size_t length, int send_eoi, size_t *bytes_written);



















static int agilent_82350b_accel_read(struct gpib_board *board, uint8_t *buffer,









static int agilent_82350b_accel_read(struct gpib_board *board, u8 *buffer,









				     size_t length, int *end, size_t *bytes_read)



















{








@@ -39,7 +39,7 @@ static int agilent_82350b_accel_read(struct gpib_board *board, uint8_t *buffer,







	int retval = 0;









	unsigned short event_status;









	int i, num_fifo_bytes;









	//hardware doesn't support checking for end-of-string character when using fifo









	/* hardware doesn't support checking for end-of-string character when using fifo */









	if (tms_priv->eos_flags & REOS)









		return tms9914_read(board, tms_priv, buffer, length, end, bytes_read);


















@@ -50,9 +50,9 @@ static int agilent_82350b_accel_read(struct gpib_board *board, uint8_t *buffer,







	*bytes_read = 0;









	if (length == 0)









		return 0;









	//disable fifo for the moment









	/* disable fifo for the moment */









	writeb(DIRECTION_GPIB_TO_HOST, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG);









	// handle corner case of board not in holdoff and one byte might slip in early









	/* handle corner case of board not in holdoff and one byte might slip in early */









	if (tms_priv->holdoff_active == 0 && length > 1) {









		size_t num_bytes;


















@@ -67,7 +67,8 @@ static int agilent_82350b_accel_read(struct gpib_board *board, uint8_t *buffer,







	tms9914_release_holdoff(tms_priv);









	i = 0;









	num_fifo_bytes = length - 1;









	write_byte(tms_priv, tms_priv->imr0_bits & ~HR_BIIE, IMR0); // disable BI interrupts









	/* disable BI interrupts */









	write_byte(tms_priv, tms_priv->imr0_bits & ~HR_BIIE, IMR0);









	while (i < num_fifo_bytes && *end == 0) {









		int block_size;









		int j;








@@ -111,17 +112,18 @@ static int agilent_82350b_accel_read(struct gpib_board *board, uint8_t *buffer,







			break;









		}









	}









	write_byte(tms_priv, tms_priv->imr0_bits, IMR0); // re-enable BI interrupts









	/* re-enable BI interrupts */









	write_byte(tms_priv, tms_priv->imr0_bits, IMR0);









	*bytes_read += i;









	buffer += i;









	length -= i;









	writeb(DIRECTION_GPIB_TO_HOST, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG);









	if (retval < 0)









		return retval;









	// read last bytes if we havn't received an END yet









	/* read last bytes if we havn't received an END yet */









	if (*end == 0) {









		size_t num_bytes;









		// try to make sure we holdoff after last byte read









		/* try to make sure we holdoff after last byte read */









		retval = tms9914_read(board, tms_priv, buffer, length, end, &num_bytes);









		*bytes_read += num_bytes;









		if (retval < 0)








@@ -145,7 +147,7 @@ static int translate_wait_return_value(struct gpib_board *board, int retval)







	return 0;









}



















static int agilent_82350b_accel_write(struct gpib_board *board, uint8_t *buffer,









static int agilent_82350b_accel_write(struct gpib_board *board, u8 *buffer,









				      size_t length, int send_eoi,









				      size_t *bytes_written)









{








@@ -169,7 +171,7 @@ static int agilent_82350b_accel_write(struct gpib_board *board, uint8_t *buffer,







	event_status = read_and_clear_event_status(board);



















#ifdef EXPERIMENTAL









	// wait for previous BO to complete if any









	/* wait for previous BO to complete if any */









	retval = wait_event_interruptible(board->wait,









					  test_bit(DEV_CLEAR_BN, &tms_priv->state) ||









					  test_bit(WRITE_READY_BN, &tms_priv->state) ||








@@ -192,7 +194,7 @@ static int agilent_82350b_accel_write(struct gpib_board *board, uint8_t *buffer,







		block_size = min(fifotransferlength - i, agilent_82350b_fifo_size);









		set_transfer_counter(a_priv, block_size);









		for (j = 0; j < block_size; ++j, ++i) {









			// load data into board's sram









			/* load data into board's sram */









			writeb(buffer[i], a_priv->sram_base + j);









		}









		writeb(ENABLE_TI_TO_SRAM, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG);








@@ -262,7 +264,7 @@ static irqreturn_t agilent_82350b_interrupt(int irq, void *arg)







		tms9914_interrupt_have_status(board, &a_priv->tms9914_priv, tms9914_status1,









					      tms9914_status2);









	}









//write-clear status bits









	/* write-clear status bits */









	if (event_status & (BUFFER_END_STATUS_BIT | TERM_COUNT_STATUS_BIT)) {









		writeb(event_status & (BUFFER_END_STATUS_BIT | TERM_COUNT_STATUS_BIT),









		       a_priv->gpib_base + EVENT_STATUS_REG);








@@ -292,12 +294,12 @@ static void set_transfer_counter(struct agilent_82350b_priv *a_priv, int count)

















	writeb(complement & 0xff, a_priv->gpib_base + XFER_COUNT_LO_REG);









	writeb((complement >> 8) & 0xff, a_priv->gpib_base + XFER_COUNT_MID_REG);









	//I don't think the hi count reg is even used, but oh well









	/* I don't think the hi count reg is even used, but oh well */









	writeb((complement >> 16) & 0xf, a_priv->gpib_base + XFER_COUNT_HI_REG);









}



















// wrappers for interface functions









static int agilent_82350b_read(struct gpib_board *board, uint8_t *buffer,









/* wrappers for interface functions */









static int agilent_82350b_read(struct gpib_board *board, u8 *buffer,









			       size_t length, int *end, size_t *bytes_read)









{









	struct agilent_82350b_priv *priv = board->private_data;








@@ -305,7 +307,7 @@ static int agilent_82350b_read(struct gpib_board *board, uint8_t *buffer,







	return tms9914_read(board, &priv->tms9914_priv, buffer, length, end, bytes_read);









}



















static int agilent_82350b_write(struct gpib_board *board, uint8_t *buffer,









static int agilent_82350b_write(struct gpib_board *board, u8 *buffer,









				size_t length, int send_eoi, size_t *bytes_written)



















{








@@ -314,7 +316,7 @@ static int agilent_82350b_write(struct gpib_board *board, uint8_t *buffer,







	return tms9914_write(board, &priv->tms9914_priv, buffer, length, send_eoi, bytes_written);









}



















static int agilent_82350b_command(struct gpib_board *board, uint8_t *buffer,









static int agilent_82350b_command(struct gpib_board *board, u8 *buffer,









				  size_t length, size_t *bytes_written)



















{








@@ -339,9 +341,7 @@ static int agilent_82350b_go_to_standby(struct gpib_board *board)







	return tms9914_go_to_standby(board, &priv->tms9914_priv);









}



















static void agilent_82350b_request_system_control(struct gpib_board *board,









						  int request_control)



















static int agilent_82350b_request_system_control(struct gpib_board *board, int request_control)









{









	struct agilent_82350b_priv *a_priv = board->private_data;


















@@ -355,7 +355,7 @@ static void agilent_82350b_request_system_control(struct gpib_board *board,







			writeb(0, a_priv->gpib_base + INTERNAL_CONFIG_REG);









	}









	writeb(a_priv->card_mode_bits, a_priv->gpib_base + CARD_MODE_REG);









	tms9914_request_system_control(board, &a_priv->tms9914_priv, request_control);









	return tms9914_request_system_control(board, &a_priv->tms9914_priv, request_control);









}



















static void agilent_82350b_interface_clear(struct gpib_board *board, int assert)








@@ -373,7 +373,7 @@ static void agilent_82350b_remote_enable(struct gpib_board *board, int enable)







	tms9914_remote_enable(board, &priv->tms9914_priv, enable);









}



















static int agilent_82350b_enable_eos(struct gpib_board *board, uint8_t eos_byte,









static int agilent_82350b_enable_eos(struct gpib_board *board, u8 eos_byte,









				     int compare_8_bits)









{









	struct agilent_82350b_priv *priv = board->private_data;








@@ -412,7 +412,7 @@ static int agilent_82350b_secondary_address(struct gpib_board *board,







	return tms9914_secondary_address(board, &priv->tms9914_priv, address, enable);









}



















static int agilent_82350b_parallel_poll(struct gpib_board *board, uint8_t *result)









static int agilent_82350b_parallel_poll(struct gpib_board *board, u8 *result)









{









	struct agilent_82350b_priv *priv = board->private_data;


















@@ -420,7 +420,7 @@ static int agilent_82350b_parallel_poll(struct gpib_board *board, uint8_t *resul







}



















static void agilent_82350b_parallel_poll_configure(struct gpib_board *board,









						   uint8_t config)









						   u8 config)









{









	struct agilent_82350b_priv *priv = board->private_data;


















@@ -434,14 +434,14 @@ static void agilent_82350b_parallel_poll_response(struct gpib_board *board, int







	tms9914_parallel_poll_response(board, &priv->tms9914_priv, ist);









}



















static void agilent_82350b_serial_poll_response(struct gpib_board *board, uint8_t status)









static void agilent_82350b_serial_poll_response(struct gpib_board *board, u8 status)









{









	struct agilent_82350b_priv *priv = board->private_data;



















	tms9914_serial_poll_response(board, &priv->tms9914_priv, status);









}



















static uint8_t agilent_82350b_serial_poll_status(struct gpib_board *board)









static u8 agilent_82350b_serial_poll_status(struct gpib_board *board)









{









	struct agilent_82350b_priv *priv = board->private_data;


















@@ -492,7 +492,7 @@ static void agilent_82350b_free_private(struct gpib_board *board)







}



















static int init_82350a_hardware(struct gpib_board *board,









				const gpib_board_config_t *config)









				const struct gpib_board_config *config)









{









	struct agilent_82350b_priv *a_priv = board->private_data;









	static const unsigned int firmware_length = 5302;








@@ -511,18 +511,18 @@ static int init_82350a_hardware(struct gpib_board *board,







		PLX9050_PCI_RETRY_DELAY_BITS(64) |









		PLX9050_DIRECT_SLAVE_LOCK_ENABLE_BIT;



















// load borg data









	/* load borg data */









	borg_status = readb(a_priv->borg_base);









	if ((borg_status & BORG_DONE_BIT))









		return 0;









	// need to programme borg









	/* need to programme borg */









	if (!config->init_data || config->init_data_length != firmware_length) {









		dev_err(board->gpib_dev, "the 82350A board requires firmware after powering on.\n");









		return -EIO;









	}









	dev_dbg(board->gpib_dev, "Loading firmware...\n");



















	// tickle the borg









	/* tickle the borg */









	writel(plx_cntrl_static_bits | PLX9050_USER3_DATA_BIT,









	       a_priv->plx_base + PLX9050_CNTRL_REG);









	usleep_range(1000, 2000);








@@ -563,7 +563,7 @@ static int test_sram(struct gpib_board *board)







	struct agilent_82350b_priv *a_priv = board->private_data;









	unsigned int i;









	const unsigned int sram_length = pci_resource_len(a_priv->pci_device, SRAM_82350A_REGION);









	// test SRAM









	/* test SRAM */









	const unsigned int byte_mask = 0xff;



















	for (i = 0; i < sram_length; ++i) {








@@ -587,7 +587,7 @@ static int test_sram(struct gpib_board *board)







}



















static int agilent_82350b_generic_attach(struct gpib_board *board,









					 const gpib_board_config_t *config,









					 const struct gpib_board_config *config,









					 int use_fifos)



















{








@@ -606,7 +606,7 @@ static int agilent_82350b_generic_attach(struct gpib_board *board,







	tms_priv->write_byte = tms9914_iomem_write_byte;









	tms_priv->offset = 1;



















	// find board









	/* find board */









	a_priv->pci_device = gpib_pci_get_device(config, PCI_VENDOR_ID_AGILENT,









						 PCI_DEVICE_ID_82350B, NULL);









	if (a_priv->pci_device) {








@@ -702,7 +702,7 @@ static int agilent_82350b_generic_attach(struct gpib_board *board,







	writeb(a_priv->card_mode_bits, a_priv->gpib_base + CARD_MODE_REG);



















	if (a_priv->model == MODEL_82350A) {









		// enable PCI interrupts for 82350a









		/* enable PCI interrupts for 82350a */









		writel(PLX9050_LINTR1_EN_BIT | PLX9050_LINTR2_POLARITY_BIT |









		       PLX9050_PCI_INTR_EN_BIT,









		       a_priv->plx_base + PLX9050_INTCSR_REG);








@@ -713,7 +713,7 @@ static int agilent_82350b_generic_attach(struct gpib_board *board,







		       a_priv->gpib_base + EVENT_ENABLE_REG);









		writeb(ENABLE_TERM_COUNT_INTERRUPT_BIT | ENABLE_BUFFER_END_INTERRUPT_BIT |









		       ENABLE_TMS9914_INTERRUPTS_BIT, a_priv->gpib_base + INTERRUPT_ENABLE_REG);









		//write-clear event status bits









		/* write-clear event status bits */









		writeb(BUFFER_END_STATUS_BIT | TERM_COUNT_STATUS_BIT,









		       a_priv->gpib_base + EVENT_STATUS_REG);









	} else {








@@ -730,13 +730,13 @@ static int agilent_82350b_generic_attach(struct gpib_board *board,







}



















static int agilent_82350b_unaccel_attach(struct gpib_board *board,









					 const gpib_board_config_t *config)









					 const struct gpib_board_config *config)









{









	return agilent_82350b_generic_attach(board, config, 0);









}



















static int agilent_82350b_accel_attach(struct gpib_board *board,









				       const gpib_board_config_t *config)









				       const struct gpib_board_config *config)









{









	return agilent_82350b_generic_attach(board, config, 1);









}








@@ -747,7 +747,7 @@ static void agilent_82350b_detach(struct gpib_board *board)







	struct tms9914_priv *tms_priv;



















	if (a_priv) {









		if (a_priv->plx_base) // disable interrupts









		if (a_priv->plx_base) /* disable interrupts */









			writel(0, a_priv->plx_base + PLX9050_INTCSR_REG);



















		tms_priv = &a_priv->tms9914_priv;








@@ -773,7 +773,7 @@ static void agilent_82350b_detach(struct gpib_board *board)







	agilent_82350b_free_private(board);









}



















static gpib_interface_t agilent_82350b_unaccel_interface = {









static struct gpib_interface agilent_82350b_unaccel_interface = {









	.name = "agilent_82350b_unaccel",









	.attach = agilent_82350b_unaccel_attach,









	.detach = agilent_82350b_detach,








@@ -790,7 +790,7 @@ static gpib_interface_t agilent_82350b_unaccel_interface = {







	.parallel_poll = agilent_82350b_parallel_poll,









	.parallel_poll_configure = agilent_82350b_parallel_poll_configure,









	.parallel_poll_response = agilent_82350b_parallel_poll_response,









	.local_parallel_poll_mode = NULL, // XXX









	.local_parallel_poll_mode = NULL, /* XXX */









	.line_status = agilent_82350b_line_status,









	.update_status = agilent_82350b_update_status,









	.primary_address = agilent_82350b_primary_address,








@@ -801,7 +801,7 @@ static gpib_interface_t agilent_82350b_unaccel_interface = {







	.return_to_local = agilent_82350b_return_to_local,









};



















static gpib_interface_t agilent_82350b_interface = {









static struct gpib_interface agilent_82350b_interface = {









	.name = "agilent_82350b",









	.attach = agilent_82350b_accel_attach,









	.detach = agilent_82350b_detach,








@@ -818,7 +818,7 @@ static gpib_interface_t agilent_82350b_interface = {







	.parallel_poll = agilent_82350b_parallel_poll,









	.parallel_poll_configure = agilent_82350b_parallel_poll_configure,









	.parallel_poll_response = agilent_82350b_parallel_poll_response,









	.local_parallel_poll_mode = NULL, // XXX









	.local_parallel_poll_mode = NULL, /* XXX */









	.line_status = agilent_82350b_line_status,









	.update_status = agilent_82350b_update_status,









	.primary_address = agilent_82350b_primary_address,
































drivers/staging/gpib/agilent_82350b/agilent_82350b.h



+14
−14






























Original line number
Diff line number
Diff line







@@ -41,11 +41,11 @@ enum board_model {







	MODEL_82351A









};



















// struct which defines private_data for board









/* struct which defines private_data for board */









struct agilent_82350b_priv {









	struct tms9914_priv tms9914_priv;









	struct pci_dev *pci_device;









	void __iomem *plx_base;	//82350a only









	void __iomem *plx_base;	/* 82350a only */









	void __iomem *gpib_base;









	void __iomem *sram_base;









	void __iomem *misc_base;








@@ -57,12 +57,12 @@ struct agilent_82350b_priv {







	bool using_fifos;









};



















//registers









/* registers */









enum agilent_82350b_gpib_registers



















{









	CARD_MODE_REG = 0x1,









	CONFIG_DATA_REG = 0x2, // 82350A specific









	CONFIG_DATA_REG = 0x2, /* 82350A specific */









	INTERRUPT_ENABLE_REG = 0x3,









	EVENT_STATUS_REG = 0x4,









	EVENT_ENABLE_REG = 0x5,








@@ -76,8 +76,8 @@ enum agilent_82350b_gpib_registers







	XFER_COUNT_HI_REG = 0xe,









	TMS9914_BASE_REG = 0x10,









	INTERNAL_CONFIG_REG = 0x18,









	IMR0_READ_REG = 0x19, //read









	T1_DELAY_REG = 0x19, // write









	IMR0_READ_REG = 0x19, /* read */









	T1_DELAY_REG = 0x19, /* write */









	IMR1_READ_REG = 0x1a,









	ADR_READ_REG = 0x1b,









	SPMR_READ_REG = 0x1c,








@@ -89,7 +89,7 @@ enum agilent_82350b_gpib_registers







enum card_mode_bits



















{









	ACTIVE_CONTROLLER_BIT = 0x2,	// read-only









	ACTIVE_CONTROLLER_BIT = 0x2, /* read-only */









	CM_SYSTEM_CONTROLLER_BIT = 0x8,









	ENABLE_BUS_MONITOR_BIT = 0x10,









	ENABLE_PCI_IRQ_BIT = 0x20,








@@ -115,15 +115,15 @@ enum event_status_bits







{









	TMS9914_IRQ_STATUS_BIT = 0x1,









	IRQ_STATUS_BIT = 0x2,









	BUFFER_END_STATUS_BIT = 0x10,	// write-clear









	TERM_COUNT_STATUS_BIT = 0x20,	// write-clear









	BUFFER_END_STATUS_BIT = 0x10, /* write-clear */









	TERM_COUNT_STATUS_BIT = 0x20, /* write-clear */









};



















enum stream_status_bits



















{









	HALTED_STATUS_BIT = 0x1,	//read









	RESTART_STREAM_BIT = 0x1,	//write









	HALTED_STATUS_BIT = 0x1, /* read */









	RESTART_STREAM_BIT = 0x1, /* write */









};



















enum internal_config_bits








@@ -135,9 +135,9 @@ enum internal_config_bits







enum sram_access_control_bits



















{









	DIRECTION_GPIB_TO_HOST = 0x20,	// transfer direction









	ENABLE_TI_TO_SRAM = 0x40,	// enable fifo









	ENABLE_FAST_TALKER = 0x80	// added for 82350A (not used)









	DIRECTION_GPIB_TO_HOST = 0x20, /* transfer direction */









	ENABLE_TI_TO_SRAM = 0x40, /* enable fifo */









	ENABLE_FAST_TALKER = 0x80 /* added for 82350A (not used) */









};



















enum borg_bits
































drivers/staging/gpib/agilent_82357a/agilent_82357a.c



+38
−38




























File changed.
Preview size limit exceeded, changes collapsed.