diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-01-30 15:20:30 -0800 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 14:03:20 +1100 |
| commit | 97ec1675999eae96975a30facbedc2e6c0c832bc (patch) | |
| tree | 3e464f69cdab789168e33d34843e63d6f23e075e /drivers/ps3 | |
| parent | 2a08ea69a3e448a5cc94e5da9eccc40cf13f9532 (diff) | |
| download | linux-97ec1675999eae96975a30facbedc2e6c0c832bc.tar.gz | |
[POWERPC] PS3: Move vuart declarations to ps3.h
Move the structures and routines needed for PS3 vuart port device registration to asm-powerpc/ps3.h. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/ps3')
| -rw-r--r-- | drivers/ps3/vuart.h | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/drivers/ps3/vuart.h b/drivers/ps3/vuart.h index 28fd89f0c8aa..11c421cf7a03 100644 --- a/drivers/ps3/vuart.h +++ b/drivers/ps3/vuart.h @@ -21,37 +21,6 @@ #if !defined(_PS3_VUART_H) #define _PS3_VUART_H -struct ps3_vuart_stats { - unsigned long bytes_written; - unsigned long bytes_read; - unsigned long tx_interrupts; - unsigned long rx_interrupts; - unsigned long disconnect_interrupts; -}; - -/** - * struct ps3_vuart_port_device - a device on a vuart port - */ - -struct ps3_vuart_port_device { - enum ps3_match_id match_id; - struct device core; - - /* private driver variables */ - unsigned int port_number; - unsigned long interrupt_mask; - struct { - spinlock_t lock; - struct list_head head; - } tx_list; - struct { - unsigned long bytes_held; - spinlock_t lock; - struct list_head head; - } rx_list; - struct ps3_vuart_stats stats; -}; - /** * struct ps3_vuart_port_driver - a driver for a device on a vuart port */ @@ -68,9 +37,9 @@ struct ps3_vuart_port_driver { /* int (*resume)(struct ps3_vuart_port_device *); */ }; -int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev); int ps3_vuart_port_driver_register(struct ps3_vuart_port_driver *drv); void ps3_vuart_port_driver_unregister(struct ps3_vuart_port_driver *drv); + int ps3_vuart_write(struct ps3_vuart_port_device *dev, const void* buf, unsigned int bytes); int ps3_vuart_read(struct ps3_vuart_port_device *dev, void* buf, @@ -86,9 +55,4 @@ static inline struct ps3_vuart_port_device *to_ps3_vuart_port_device( return container_of(_dev, struct ps3_vuart_port_device, core); } -int ps3_vuart_write(struct ps3_vuart_port_device *dev, const void* buf, - unsigned int bytes); -int ps3_vuart_read(struct ps3_vuart_port_device *dev, void* buf, - unsigned int bytes); - #endif |