---

yaml --- r: 162206 b: refs/heads/master c: 0ccafb3 h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · 70bfebf · 70bfebf
1 parent 524391a
commit 70bfebf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4983b39a0687b00688478e6748b979a02934b234
+refs/heads/master: 0ccafb365803b3256aa75fd07bf9e5c6814a260d
diff --git a/trunk/drivers/staging/hv/osd.h b/trunk/drivers/staging/hv/osd.h
@@ -27,32 +27,28 @@
 
 
 /* Defines */
+#define ALIGN_UP(value, align)	(((value) & (align-1)) ?		\
+				 (((value) + (align-1)) & ~(align-1)) :	\
+				 (value))
+#define ALIGN_DOWN(value, align)	((value) & ~(align-1))
+#define NUM_PAGES_SPANNED(addr, len)	((ALIGN_UP(addr+len, PAGE_SIZE) - \
+					 ALIGN_DOWN(addr, PAGE_SIZE)) >>  \
+					 PAGE_SHIFT)
 
-
-
-#define ALIGN_UP(value, align)			( ((value) & (align-1))? ( ((value) + (align-1)) & ~(align-1) ): (value) )
-#define ALIGN_DOWN(value, align)		( (value) & ~(align-1) )
-#define NUM_PAGES_SPANNED(addr, len)	( (ALIGN_UP(addr+len, PAGE_SIZE) - ALIGN_DOWN(addr, PAGE_SIZE)) >> PAGE_SHIFT )
-
-#define LOWORD(dw)		((unsigned short) (dw))
-#define HIWORD(dw)		((unsigned short) (((unsigned int) (dw) >> 16) & 0xFFFF))
+#define LOWORD(dw)	((unsigned short)(dw))
+#define HIWORD(dw)	((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF))
 
 typedef struct _DLIST_ENTRY {
-   struct _DLIST_ENTRY *Flink;
-   struct _DLIST_ENTRY *Blink;
+	struct _DLIST_ENTRY *Flink;
+	struct _DLIST_ENTRY *Blink;
 } DLIST_ENTRY;
 
-
-/* Other types */
-
-/* typedef unsigned char		GUID[16]; */
-
 typedef struct {
-	unsigned char	Data[16];
+	unsigned char Data[16];
 } GUID;
 
 struct osd_waitevent {
-	int	condition;
+	int condition;
 	wait_queue_head_t event;
 };
 
@@ -61,15 +57,15 @@ struct osd_waitevent {
 extern void *osd_VirtualAllocExec(unsigned int size);
 
 extern void *osd_PageAlloc(unsigned int count);
-extern void osd_PageFree(void* page, unsigned int count);
+extern void osd_PageFree(void *page, unsigned int count);
 
 extern struct osd_waitevent *osd_WaitEventCreate(void);
 extern void osd_WaitEventSet(struct osd_waitevent *waitEvent);
 extern int osd_WaitEventWait(struct osd_waitevent *waitEvent);
 
 /* If >0, waitEvent got signaled. If ==0, timeout. If < 0, error */
-extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent, u32 TimeoutInMs);
-
+extern int osd_WaitEventWaitEx(struct osd_waitevent *waitEvent,
+			       u32 TimeoutInMs);
 
 int osd_schedule_callback(struct workqueue_struct *wq,
 			  void (*func)(void *),