KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

ddk:update to 3.12

Browse Source 
git-svn-id: svn://kolibrios.org@4279 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2013-11-22 14:32:23 +00:00
parent edbd5b909f
commit bd92a354fb
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ddk/stdio/vsprintf.c
View File

@ -549,7 +549,7 @@ char *string(char *buf, char *end, const char *s, struct printf_spec spec)
{ {
int len, i; int len, i;
if ((unsigned long)s < PAGE_SIZE) if (s == NULL)
s = "(null)"; s = "(null)";
len = strnlen(s, spec.precision); len = strnlen(s, spec.precision);

5
drivers/include/drm/drmP.h
View File

@ -185,7 +185,7 @@ int drm_err(const char *func, const char *format, ...);
/** \name Begin the DRM... */ /** \name Begin the DRM... */
/*@{*/ /*@{*/
#define DRM_DEBUG_CODE 0 /**< Include debugging code if > 1, then #define DRM_DEBUG_CODE 2 /**< Include debugging code if > 1, then
also include looping detection. */ also include looping detection. */
#define DRM_MAGIC_HASH_ORDER 4 /**< Size of key hash table. Must be power of 2. */ #define DRM_MAGIC_HASH_ORDER 4 /**< Size of key hash table. Must be power of 2. */
@ -1358,7 +1358,8 @@ extern int drm_freebufs(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int drm_mapbufs(struct drm_device *dev, void *data, extern int drm_mapbufs(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
extern int drm_order(unsigned long size); extern int drm_dma_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
/* DMA support (drm_dma.h) */ /* DMA support (drm_dma.h) */
extern int drm_legacy_dma_setup(struct drm_device *dev); extern int drm_legacy_dma_setup(struct drm_device *dev);

8
drivers/include/linux/fb.h
View File

@ -887,6 +887,8 @@ struct fb_info {
resource_size_t size; resource_size_t size;
} ranges[0]; } ranges[0];
} *apertures; } *apertures;
bool skip_vt_switch; /* no VT switch on suspend/resume required */
}; };
static inline struct apertures_struct *alloc_apertures(unsigned int max_num) { static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
@ -1095,6 +1097,12 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb);
extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb); extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter); extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
extern int of_get_fb_videomode(struct device_node *np,
struct fb_videomode *fb,
int index);
extern int fb_videomode_from_videomode(const struct videomode *vm,
struct fb_videomode *fbmode);
/* drivers/video/modedb.c */ /* drivers/video/modedb.c */
#define VESA_MODEDB_SIZE 34 #define VESA_MODEDB_SIZE 34
extern void fb_var_to_videomode(struct fb_videomode *mode, extern void fb_var_to_videomode(struct fb_videomode *mode,

3
drivers/include/linux/mod_devicetable.h
View File

@ -121,7 +121,8 @@ struct usb_device_id {
__u8 bInterfaceNumber; __u8 bInterfaceNumber;
/* not matched against */ /* not matched against */
kernel_ulong_t driver_info; kernel_ulong_t driver_info
__attribute__((aligned(sizeof(kernel_ulong_t))));
}; };
/* Some useful macros to use to create struct usb_device_id */ /* Some useful macros to use to create struct usb_device_id */