WebSVN - shark - Path Comparison - /shark/trunk/drivers/svga/ Rev 79 and /shark/trunk/drivers/svga/ Rev 80

Ignore whitespace Rev 79 → Rev 80

/shark/trunk/drivers/svga/vgammvgaio.h
1,2 → 1,6
#include "ll/sys/cdefs.h"

__BEGIN_DECLS
extern unsigned long __svgalib_vgammbase;
extern void __svgalib_mm_io_mapio(void);
__END_DECLS

 /shark/trunk/drivers/svga/vgaregs.h
 ,5 → 1,8
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /* Register indices into mode state array. */
 #define VGA_CRTC_COUNT          24
 ,3 → 117,5
 #define __svgalib_inCR __svgalib_incrtc
 #define __svgalib_outCR __svgalib_outcrtc
 #define __svgalib_outbCR __svgalib_outcrtc
+__END_DECLS

 /shark/trunk/drivers/svga/interface.h
 ,5 → 1,8
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /* Prototypes of functions defined in interface.c. */
 /*
 ,3 → 24,4
  */
 void __svgalib_clear_accelspecs(AccelSpecs * accelspecs);
+__END_DECLS

/shark/trunk/drivers/svga/vgarelvgaio.h
1,2 → 1,6
#include "ll/sys/cdefs.h"

__BEGIN_DECLS
extern int __svgalib_io_reloc;
extern void __svgalib_rel_io_mapio(void);
__END_DECLS

 /shark/trunk/drivers/svga/io.h
 ,5 → 1,8
 #include <stdint.h>
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 #ifndef __alpha__
 #define v_readb(addr) (*(volatile uint8_t *) (MMIO_POINTER+(addr)))
 ,4 → 70,5
         mb();
 }
+__END_DECLS
 #endif /* __alpha__ */

 /shark/trunk/drivers/svga/accel.h
 ,6 → 2,10
 #ifndef ACCEL_H
 #define ACCEL_H
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /*
  * New accelerator interface sketch.
  * As of svgalib 1.23, this isn't used yet.
 ,4 → 205,5
  * void initOperations( AccelSpecs *accelspecs, int bpp, int width_in_pixels );
  */
+__END_DECLS
 #endif

 /shark/trunk/drivers/svga/endianess.h
 ,6 → 1,9
 #include <endian.h>
 #include <byteswap.h>
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define LE32(x) bswap_32(x)
 ,3 → 15,5
 #define BE32(x) bswap_32(x)
 #endif
+__END_DECLS

 /shark/trunk/drivers/svga/vgapci.h
 ,3 → 1,6
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 extern int __svgalib_pci_find_vendor_vga(unsigned int vendor, unsigned long *conf, int cont);
 extern int __svgalib_pci_find_vendor_vga_pos(unsigned int vendor, unsigned long *conf, int cont);
 extern int __svgalib_pci_idev;
 ,4 → 12,4
 extern int __svgalib_pci_read_config_dword(int pos, int address);
 extern int __svgalib_pci_read_aperture_len(int pos, int address);
 extern int memorytest(unsigned char *m, int max_mem);
+__END_DECLS

 /shark/trunk/drivers/svga/grx/glib.h
 ,11 → 20,11
 /**
  ------------
- CVS :        $Id: glib.h,v 1.2 2003-03-13 13:08:38 giacomo Exp $
+ CVS :        $Id: glib.h,v 1.3 2003-03-13 13:46:08 pj Exp $
  File:        $File$
- Revision:    $Revision: 1.2 $
- Last update: $Date: 2003-03-13 13:08:38 $
+ Revision:    $Revision: 1.3 $
+ Last update: $Date: 2003-03-13 13:46:08 $
  ------------
 **/
 ,7 → 52,10
 #define __GLIB_H__
 #include <ll/sys/types.h>
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 int grx_setbuffer(BYTE *vbuf,WORD w, WORD h);
 void grx_plot(WORD x, WORD y, DWORD color);
 ,5 → 69,5
 void grx_circle(WORD x, WORD y, WORD r, DWORD col);
 void grx_disc(WORD x, WORD y, WORD r, DWORD col);
 void grx_clear(DWORD color);
+__END_DECLS
 #endif

 /shark/trunk/drivers/svga/nvreg.h
 ,6 → 26,10
 #ifndef __NVREG_H_
 #define __NVREG_H_
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /* Little macro to construct bitmask for contiguous ranges of bits */
 #define BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1)  << (b))
 #define MASKEXPAND(mask) BITMASK(1?mask,0?mask)
 ,6 → 176,8
 NVChipType GetChipType(void);
 */
+__END_DECLS
 #endif

/shark/trunk/drivers/svga/vgaversion.h
1,2 → 1,7
#include "ll/sys/cdefs.h"

__BEGIN_DECLS
int vga_version=0x1917;
static char versionstr[32]="1.9.17";
__END_DECLS

 /shark/trunk/drivers/svga/driver.h
 ,7 → 17,10
 #include "timing.h"
 #include "accel.h"
 #include "io.h"
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 #define MAX_REGS 5000 /* VESA needs a lot of storage space */
 extern int inrestore;
 ,4 → 195,5
 extern void __svgalib_readmodes(FILE * inp, ModeTable ** modes, int *dac, unsigned *clocks);
+__END_DECLS
 #endif

 /shark/trunk/drivers/svga/interrupt.h
 ,5 → 1,8
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 void vga_init_vsync(struct sh_pci_device *);
 int vga_test_vsync(struct sh_pci_device *);
 void vga_ack_vsync(struct sh_pci_device *);
 void vga_enable_vsync(struct sh_pci_device *);
+__END_DECLS

 /shark/trunk/drivers/svga/clockchip.h
 ,3 → 1,7
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /*
  * clockchip.h
  */
 ,3 → 34,5
 } ClockChipMethods;
 extern ClockChipMethods __svgalib_I2061A_clockchip_methods;
+__END_DECLS

 /shark/trunk/drivers/svga/8514a.h
 ,7 → 10,10
 #ifndef _8514A_H
 #define _8514A_H
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 #define CMD             0x9AE8
 #define ALU_FG_FN       0xBAEE
 #define ALU_BG_FN       0xB6EE
 ,5 → 91,5
 #define DEST_CMP_FN     0xEEEE
 #define CMP_COLOR       0xB2E8
 #define RD_MASK         0xAEE8
+__END_DECLS
 #endif                          /* _8514A_H */

 /shark/trunk/drivers/svga/lrmi.h
 ,6 → 13,10
 #ifndef LRMI_H
 #define LRMI_H
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 struct LRMI_regs
         {
         unsigned int edi;
 ,4 → 55,6
 int
 LRMI_int(int interrupt, struct LRMI_regs *r);
+__END_DECLS
 #endif

 /shark/trunk/drivers/svga/libvga.h
 ,6 → 11,10
 #include <string.h>
 #include <stdint.h>
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 //typedef unsigned int CARD32;
 //typedef unsigned short CARD16;
 //typedef unsigned char CARD8;
 ,5 → 279,7
 #define DPRINTF(...)
 #endif
+__END_DECLS
 #endif /* _LIBVGA_H */

 /shark/trunk/drivers/svga/vgaio.h
 ,5 → 1,7
 #include "libvga.h"
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 extern int __svgalib_vga_inmisc(void);
 extern void __svgalib_vga_outmisc(int i);
 extern int __svgalib_vga_incrtc(int i);
 ,3 → 16,4
 extern void __svgalib_vga_attscreen(int i);
 extern void __svgalib_vga_inpal(int i, int *r, int *g, int *b);
 extern void __svgalib_vga_outpal(int i, int r, int g, int b);
+__END_DECLS

 /shark/trunk/drivers/svga/vga.h
 ,11 → 14,9
 #include <drivers/grxsvga/glib.h>
 #include <kernel/log.h>
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 #define rgb15(r, g, b) ((((WORD)(r & 0xF8)>>3) << 10) | (((WORD)(g & 0xF8)>>3) << 5) | ((WORD)(b & 0xF8)>>3))
 #define rgb16(r, g, b) ((((WORD)(r & 0xF8)>>3) << 11) | (((WORD)(g & 0xFC)>>2) << 5) | ((WORD)(b & 0xF8)>>3))
 #define rgb24(r, g, b) (((DWORD)(r & 0xFF) << 16) | ((DWORD)(g & 0xFF) << 8) | (DWORD)(b & 0xFF))
 ,8 → 584,6
 #define VGA_COMEFROMBACK -2
 extern int vga_runinbackground_version(void);
-#ifdef __cplusplus
-}
+__END_DECLS
-#endif
 #endif                          /* VGA_H */

 /shark/trunk/drivers/svga/svgalib_helper.h
 ,6 → 1,10
 #ifndef __SVGALIB_HELPER__
 #define __SVGALIB_HELPER__
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 #ifdef __KERNEL__
 #define MAX_NR_DEVICES 15
 ,6 → 89,8
 int svgalib_helper_ioctl( struct inode *inode, unsigned int cmd, unsigned long arg);
+__END_DECLS
 #endif

 /shark/trunk/drivers/svga/ramdac.h
 ,6 → 4,10
  * Structures and functions for programmable ramdac support.
  */
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /* DacMethods type. */
 typedef struct {
 ,3 → 168,5
 void _ramdac_dactopel(void);
 unsigned char _ramdac_setcomm(unsigned char data);
 #endif
+__END_DECLS

 /shark/trunk/drivers/svga/timing.h
 ,6 → 2,10
 #ifndef TIMING_H
 #define TIMING_H
+#include "ll/sys/cdefs.h"
+__BEGIN_DECLS
 /*
  * Generic mode timing module.
  */
 ,4 → 171,6
 #define GTF_lockHF      2               /* Lock to horizontal frequency */
 #define GTF_lockPF      3               /* Lock to pixel clock frequency*/
+__END_DECLS
 #endif