diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 00:28:13 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 00:28:13 -0400 |
commit | b5e89ed53ed8d24f83ba1941c07382af00ed238e (patch) | |
tree | 747bae7a565f88a2e1d5974776eeb054a932c505 /drivers/char/drm/sis_ds.h | |
parent | 99a2657a29e2d623c3568cd86b27cac13fb63140 (diff) |
drm: lindent the drm directory.
I've been threatening this for a while, so no point hanging around.
This lindents the DRM code which was always really bad in tabbing department.
I've also fixed some misnamed files in comments and removed some trailing
whitespace.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/sis_ds.h')
-rw-r--r-- | drivers/char/drm/sis_ds.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/char/drm/sis_ds.h b/drivers/char/drm/sis_ds.h index 171ee75afa57..da850b4f5440 100644 --- a/drivers/char/drm/sis_ds.h +++ b/drivers/char/drm/sis_ds.h | |||
@@ -10,11 +10,11 @@ | |||
10 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | 10 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
11 | * and/or sell copies of the Software, and to permit persons to whom the | 11 | * and/or sell copies of the Software, and to permit persons to whom the |
12 | * Software is furnished to do so, subject to the following conditions: | 12 | * Software is furnished to do so, subject to the following conditions: |
13 | * | 13 | * |
14 | * The above copyright notice and this permission notice (including the next | 14 | * The above copyright notice and this permission notice (including the next |
15 | * paragraph) shall be included in all copies or substantial portions of the | 15 | * paragraph) shall be included in all copies or substantial portions of the |
16 | * Software. | 16 | * Software. |
17 | * | 17 | * |
18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 18 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 19 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 20 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
@@ -22,10 +22,10 @@ | |||
22 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | 22 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, |
23 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 23 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | * | 25 | * |
26 | * Authors: | 26 | * Authors: |
27 | * Sung-Ching Lin <sclin@sis.com.tw> | 27 | * Sung-Ching Lin <sclin@sis.com.tw> |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef __SIS_DS_H__ | 31 | #ifndef __SIS_DS_H__ |
@@ -50,11 +50,11 @@ typedef struct { | |||
50 | } set_t; | 50 | } set_t; |
51 | 51 | ||
52 | set_t *setInit(void); | 52 | set_t *setInit(void); |
53 | int setAdd(set_t *set, ITEM_TYPE item); | 53 | int setAdd(set_t * set, ITEM_TYPE item); |
54 | int setDel(set_t *set, ITEM_TYPE item); | 54 | int setDel(set_t * set, ITEM_TYPE item); |
55 | int setFirst(set_t *set, ITEM_TYPE *item); | 55 | int setFirst(set_t * set, ITEM_TYPE * item); |
56 | int setNext(set_t *set, ITEM_TYPE *item); | 56 | int setNext(set_t * set, ITEM_TYPE * item); |
57 | int setDestroy(set_t *set); | 57 | int setDestroy(set_t * set); |
58 | 58 | ||
59 | /* | 59 | /* |
60 | * GLX Hardware Device Driver common code | 60 | * GLX Hardware Device Driver common code |
@@ -73,9 +73,9 @@ int setDestroy(set_t *set); | |||
73 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | 73 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
74 | * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 74 | * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
75 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | 75 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
76 | * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, | 76 | * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, |
77 | * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | 77 | * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR |
78 | * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE | 78 | * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE |
79 | * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 79 | * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
80 | * | 80 | * |
81 | */ | 81 | */ |
@@ -83,7 +83,7 @@ int setDestroy(set_t *set); | |||
83 | struct mem_block_t { | 83 | struct mem_block_t { |
84 | struct mem_block_t *next; | 84 | struct mem_block_t *next; |
85 | struct mem_block_t *heap; | 85 | struct mem_block_t *heap; |
86 | int ofs,size; | 86 | int ofs, size; |
87 | int align; | 87 | int align; |
88 | unsigned int free:1; | 88 | unsigned int free:1; |
89 | unsigned int reserved:1; | 89 | unsigned int reserved:1; |
@@ -109,11 +109,11 @@ static __inline__ void mmMarkReserved(PMemBlock b) | |||
109 | b->reserved = 1; | 109 | b->reserved = 1; |
110 | } | 110 | } |
111 | 111 | ||
112 | /* | 112 | /* |
113 | * input: total size in bytes | 113 | * input: total size in bytes |
114 | * return: a heap pointer if OK, NULL if error | 114 | * return: a heap pointer if OK, NULL if error |
115 | */ | 115 | */ |
116 | memHeap_t *mmInit( int ofs, int size ); | 116 | memHeap_t *mmInit(int ofs, int size); |
117 | 117 | ||
118 | /* | 118 | /* |
119 | * Allocate 'size' bytes with 2^align2 bytes alignment, | 119 | * Allocate 'size' bytes with 2^align2 bytes alignment, |
@@ -125,21 +125,21 @@ memHeap_t *mmInit( int ofs, int size ); | |||
125 | * startSearch = linear offset from start of heap to begin search | 125 | * startSearch = linear offset from start of heap to begin search |
126 | * return: pointer to the allocated block, 0 if error | 126 | * return: pointer to the allocated block, 0 if error |
127 | */ | 127 | */ |
128 | PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch ); | 128 | PMemBlock mmAllocMem(memHeap_t * heap, int size, int align2, int startSearch); |
129 | 129 | ||
130 | /* | 130 | /* |
131 | * Returns 1 if the block 'b' is part of the heap 'heap' | 131 | * Returns 1 if the block 'b' is part of the heap 'heap' |
132 | */ | 132 | */ |
133 | int mmBlockInHeap( PMemBlock heap, PMemBlock b ); | 133 | int mmBlockInHeap(PMemBlock heap, PMemBlock b); |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * Free block starts at offset | 136 | * Free block starts at offset |
137 | * input: pointer to a block | 137 | * input: pointer to a block |
138 | * return: 0 if OK, -1 if error | 138 | * return: 0 if OK, -1 if error |
139 | */ | 139 | */ |
140 | int mmFreeMem( PMemBlock b ); | 140 | int mmFreeMem(PMemBlock b); |
141 | 141 | ||
142 | /* For debuging purpose. */ | 142 | /* For debuging purpose. */ |
143 | void mmDumpMemInfo( memHeap_t *mmInit ); | 143 | void mmDumpMemInfo(memHeap_t * mmInit); |
144 | 144 | ||
145 | #endif /* __SIS_DS_H__ */ | 145 | #endif /* __SIS_DS_H__ */ |