diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-26 15:10:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-26 15:10:40 -0400 |
| commit | 0031af9ce7b1c2d98ce77cc20bd7546d64e334fe (patch) | |
| tree | 196dda8bb4fdae67ec24514eac2372930e912acb /include | |
| parent | cc0427d2695220961f43dfb5e110511a9cb8ae16 (diff) | |
| parent | 438505fe696b176cbf56cd34db870e04027d3531 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/ns16550.h | 10 | ||||
| -rw-r--r-- | include/serial.h | 10 | ||||
| -rw-r--r-- | include/vbe.h | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/include/ns16550.h b/include/ns16550.h index 7e9944d0d9..5fcbcd2e74 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -51,10 +51,6 @@ * @base: Base register address * @reg_shift: Shift size of registers (0=byte, 1=16bit, 2=32bit...) * @clock: UART base clock speed in Hz - * - * @buf: Pointer to the RX interrupt buffer - * @rd_ptr: Read pointer in the RX interrupt buffer - * @wr_ptr: Write pointer in the RX interrupt buffer */ struct ns16550_platdata { unsigned long base; @@ -62,12 +58,6 @@ struct ns16550_platdata { int clock; int reg_offset; u32 fcr; - - int irq; - - char *buf; - int rd_ptr; - int wr_ptr; }; struct udevice; diff --git a/include/serial.h b/include/serial.h index f4171964ae..d87f01082a 100644 --- a/include/serial.h +++ b/include/serial.h @@ -148,10 +148,18 @@ struct dm_serial_ops { /** * struct serial_dev_priv - information about a device used by the uclass * - * @sdev: stdio device attached to this uart + * @sdev: stdio device attached to this uart + * + * @buf: Pointer to the RX buffer + * @rd_ptr: Read pointer in the RX buffer + * @wr_ptr: Write pointer in the RX buffer */ struct serial_dev_priv { struct stdio_dev *sdev; + + char *buf; + int rd_ptr; + int wr_ptr; }; /* Access the serial operations for a device */ diff --git a/include/vbe.h b/include/vbe.h index 16bb096236..d6980d953f 100644 --- a/include/vbe.h +++ b/include/vbe.h @@ -104,8 +104,6 @@ struct vbe_ddc_info { extern struct vbe_mode_info mode_info; -struct graphic_device; -int vbe_get_video_info(struct graphic_device *gdev); struct video_priv; struct video_uc_platdata; int vbe_setup_video_priv(struct vesa_mode_info *vesa, |