diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | man/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/sis300_accel.h | 10 | ||||
| -rw-r--r-- | src/sis_driver.c | 2 | ||||
| -rw-r--r-- | src/sis_setup.c | 6 | ||||
| -rw-r--r-- | src/sispcirename.h | 2 |
7 files changed, 14 insertions, 14 deletions
@@ -71,8 +71,8 @@ core *.tar.bz2 *.tar.gz # -# Add & Override patterns for xf86-video-sis +# Add & Override patterns for xf86-video-sis # # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' -# +# diff --git a/man/Makefile.am b/man/Makefile.am index 9ceb36f..26b4cac 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,7 +19,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# +# drivermandir = $(DRIVER_MAN_DIR) diff --git a/src/Makefile.am b/src/Makefile.am index b773c92..1fa6ce8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,5 +76,5 @@ sis_drv_la_SOURCES = \ if DRI sis_drv_la_SOURCES += \ sis_dri.c \ - sis_dri.h + sis_dri.h endif diff --git a/src/sis300_accel.h b/src/sis300_accel.h index 3a0707d..eeb08ca 100644 --- a/src/sis300_accel.h +++ b/src/sis300_accel.h @@ -295,13 +295,13 @@ CmdQueLen--; -/* Set Pattern register */ +/* Set Pattern register */ #define SiSSetPattern(num, value) \ if (CmdQueLen <= 0) SiSIdle; \ SIS_MMIO_OUT32(pSiS->IOBase, (PATTERN_REG + (num * 4)), value); \ CmdQueLen--; - + /* 3D stuff (used for RENDER) */ /* @@ -1036,7 +1036,7 @@ #define RGB_REPLACE__A_STAGE1 0xa3230000 #define RGBA_REPLACE__RGB_STAGE1 0xe1485000 #define RGBA_REPLACE__A_STAGE1 0xe3230000 - + #define A_MODULATE_RGB_STAGE1 0xa1485000 #define A_MODULATE_A_STAGE1 0xa3e30000 #define L_MODULATE__RGB_STAGE1 0xa1785000 @@ -1066,7 +1066,7 @@ #define RGB_BLEND__RGB_STAGE1 0x45394001 #define RGB_BLEND__A_STAGE1 0xa3230000 #define RGBA_BLEND__RGB_STAGE1 0x45394001 -#define RGBA_BLEND__A_STAGE1 0xa3e30000 +#define RGBA_BLEND__A_STAGE1 0xa3e30000 #define INIT_6327_CapsEnable 0x00000080 @@ -1180,5 +1180,5 @@ do{ \ CmdQueLen = (SIS_MMIO_IN16(pSiS->IOBase, 0x8240) & pSiS->CmdQueLenMask) - pSiS->CmdQueLenFix; \ } \ CmdQueLen -= (int)(wLen); \ -} while(0) +} while(0) diff --git a/src/sis_driver.c b/src/sis_driver.c index 002e481..67b9d3d 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -1508,7 +1508,7 @@ SiSGenerateModeListFromMetaModes(ScrnInfoPtr pScrn, char* str, } } while(*(str++) != 0); - + return result; } diff --git a/src/sis_setup.c b/src/sis_setup.c index 77faa0a..4f17cd3 100644 --- a/src/sis_setup.c +++ b/src/sis_setup.c @@ -188,7 +188,7 @@ sis_pci_read_host_bridge_u8(int offset) { return sis_pci_read_device_u8(0, offset); } - + static int sisESSPresent(ScrnInfoPtr pScrn) { int flags = 0; @@ -219,13 +219,13 @@ static int sisESSPresent(ScrnInfoPtr pScrn) id_iterator = pci_id_match_iterator_create(&id_match); - ess137x = pci_device_next(id_iterator); + ess137x = pci_device_next(id_iterator); while (ess137x) { if ((ess137x->device_id == 0x5000) || ((ess137x->device_id & 0xfff0) == 0x1370)) { flags |= ESS137xPRESENT; } - ess137x = pci_device_next(id_iterator); + ess137x = pci_device_next(id_iterator); } return flags; #endif diff --git a/src/sispcirename.h b/src/sispcirename.h index 0bcb5b9..6d1d3da 100644 --- a/src/sispcirename.h +++ b/src/sispcirename.h @@ -33,7 +33,7 @@ enum region_type { REGION_MEM, - REGION_IO + REGION_IO }; #include "xf86Module.h" |