diff --git a/dde_linux/lib/mk/usb.inc b/dde_linux/lib/mk/usb.inc index f5b700328..b899f7e4a 100644 --- a/dde_linux/lib/mk/usb.inc +++ b/dde_linux/lib/mk/usb.inc @@ -25,8 +25,7 @@ CC_OPT += -DCONFIG_USB_DEVICEFS -DCONFIG_HOTPLUG -DDEBUG CC_WARN = -Wall -Wno-unused-variable -Wno-uninitialized \ -Wno-unused-function -Wno-overflow -CC_C_OPT += -Wno-implicit-function-declaration -Wno-unused-but-set-variable \ - -Wno-pointer-sign +CC_C_OPT += -Wno-unused-but-set-variable -Wno-pointer-sign CXX_OPT = -fpermissive # diff --git a/dde_linux/src/lib/usb/include/arm/platform/lx_emul.h b/dde_linux/src/lib/usb/include/arm/platform/lx_emul.h index 4178c28c9..c03d52308 100644 --- a/dde_linux/src/lib/usb/include/arm/platform/lx_emul.h +++ b/dde_linux/src/lib/usb/include/arm/platform/lx_emul.h @@ -215,6 +215,7 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); void phy_print_status(struct phy_device *phydev); int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); +void phy_start(struct phy_device *phydev); int phy_start_aneg(struct phy_device *phydev); void phy_stop(struct phy_device *phydev); int genphy_resume(struct phy_device *phydev); diff --git a/dde_linux/src/lib/usb/include/lx_emul.h b/dde_linux/src/lib/usb/include/lx_emul.h index ccf449980..2b8cc6bdf 100644 --- a/dde_linux/src/lib/usb/include/lx_emul.h +++ b/dde_linux/src/lib/usb/include/lx_emul.h @@ -359,6 +359,8 @@ void put_unaligned_le16(u16 val, void *p); void put_unaligned_le32(u32 val, void *p); u32 get_unaligned_le32(const void *p); +void put_unaligned_be32(u32 val, void *p); + void put_unaligned_le64(u64 val, void *p); u64 get_unaligned_le64(const void *p); @@ -628,6 +630,7 @@ int kstrtouint(const char *s, unsigned int base, unsigned int *res); int strict_strtoul(const char *s, unsigned int base, unsigned long *res); long simple_strtoul(const char *cp, char **endp, unsigned int base); +int hex_to_bin(char ch); /* * Needed by 'usb.h' @@ -823,6 +826,7 @@ struct module; module_exit(__driver##_exit); +int try_module_get(struct module *module); static inline void module_put(struct module *module) { } static inline void __module_get(struct module *module) { } @@ -944,6 +948,7 @@ unsigned long msecs_to_jiffies(const unsigned int m); unsigned int jiffies_to_msecs(const unsigned long j); long time_after(long a, long b); long time_after_eq(long a, long b); +long time_before(long a, long b); /******************* @@ -2717,7 +2722,14 @@ struct request void blk_queue_bounce_limit(struct request_queue *, u64); void blk_queue_dma_alignment(struct request_queue *, int); void blk_queue_max_hw_sectors(struct request_queue *, unsigned int); +int blk_queue_resize_tags(struct request_queue *, int); +int blk_queue_tagged(struct request_queue *); +void blk_queue_update_dma_alignment(struct request_queue *, int); + +void blk_complete_request(struct request *); + sector_t blk_rq_pos(const struct request *rq); + unsigned int queue_max_hw_sectors(struct request_queue *q); #include @@ -2756,6 +2768,7 @@ int scsi_normalize_sense(const u8 *sense_buffer, int sb_len, const u8 * scsi_sense_desc_find(const u8 * sense_buffer, int sb_len, int desc_type); +int scsi_sense_valid(struct scsi_sense_hdr *); /********************* ** scsi/scsi_tcq.h ** @@ -2847,11 +2860,17 @@ int scsi_get_resid(struct scsi_cmnd *cmd); struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd); struct scsi_target *scsi_target(struct scsi_device *sdev); +void trace_scsi_dispatch_cmd_start(struct scsi_cmnd *); +void trace_scsi_dispatch_cmd_error(struct scsi_cmnd *, int); +void trace_scsi_dispatch_cmd_done(struct scsi_cmnd *); /************************ ** scsi/scsi_device.h ** ************************/ +#define scmd_printk(prefix, scmd, fmt, a...) +#define sdev_printk(prefix, sdev, fmt, a...) + struct scsi_target { struct list_head devices; @@ -2929,6 +2948,11 @@ struct scsi_device #define shost_for_each_device(sdev, shost) dde_kit_printf("shost_for_each_device called\n"); #define __shost_for_each_device(sdev, shost) dde_kit_printf("__shost_for_each_device called\n"); +int scsi_device_blocked(struct scsi_device *); +int scsi_device_get(struct scsi_device *); +int scsi_execute_req(struct scsi_device *, const unsigned char *, int, void *, + unsigned, struct scsi_sense_hdr *, int , int , int *); + /************************ ** scsi/scsi_driver.h ** @@ -3466,6 +3490,7 @@ void ida_simple_remove(struct ida *ida, unsigned int id); struct async_domain { }; #define ASYNC_DOMAIN(name) struct async_domain name = { }; +void async_unregister_domain(struct async_domain *domain); /******************************* @@ -3496,6 +3521,12 @@ int bitmap_subset(const unsigned long *, u16 crc16(u16 crc, const u8 *buffer, size_t len); +/******************* + ** linux/crc32.h ** + *******************/ + +u32 ether_crc(int, unsigned char *); + /******************* ** linux/birev.h ** *******************/