geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert a few more U32 variables to more appropriate, generic types.

main
Ian Romanick 2007-06-29 21:48:31 -07:00
parent 49ccec1b08
commit fc37781dd3
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
linux-core/xgi_cmdlist.c
View File

@ -36,11 +36,11 @@
struct xgi_cmdring_info s_cmdring;
static void addFlush2D(struct xgi_info * info);
static U32 getCurBatchBeginPort(struct xgi_cmd_info * pCmdInfo);
static unsigned int getCurBatchBeginPort(struct xgi_cmd_info * pCmdInfo);
static void triggerHWCommandList(struct xgi_info * info, U32 triggerCounter);
static void xgi_cmdlist_reset(void);
int xgi_cmdlist_initialize(struct xgi_info * info, U32 size)
int xgi_cmdlist_initialize(struct xgi_info * info, size_t size)
{
//struct xgi_mem_req mem_req;
struct xgi_mem_alloc mem_alloc;
@ -64,7 +64,7 @@ int xgi_cmdlist_initialize(struct xgi_info * info, U32 size)
void xgi_submit_cmdlist(struct xgi_info * info, struct xgi_cmd_info * pCmdInfo)
{
U32 beginPort;
unsigned int beginPort;
/** XGI_INFO("Jong-xgi_submit_cmdlist-Begin \n"); **/
/* Jong 05/25/2006 */
@ -77,7 +77,7 @@ void xgi_submit_cmdlist(struct xgi_info * info, struct xgi_cmd_info * pCmdInfo)
/* return; */
if (s_cmdring._lastBatchStartAddr == 0) {
U32 portOffset;
unsigned int portOffset;
/* Jong 06/13/2006; remove marked for system hang test */
/* xgi_waitfor_pci_idle(info); */
@ -278,17 +278,17 @@ void xgi_cmdlist_cleanup(struct xgi_info * info)
static void triggerHWCommandList(struct xgi_info * info, U32 triggerCounter)
{
static U32 s_triggerID = 1;
static unsigned int s_triggerID = 1;
//Fix me, currently we just trigger one time
while (triggerCounter--) {
dwWriteReg(BASE_3D_ENG + M2REG_PCI_TRIGGER_REGISTER_ADDRESS,
0x05000000 + (0xffff & s_triggerID++));
0x05000000 + (0x0ffff & s_triggerID++));
// xgi_waitfor_pci_idle(info);
}
}
static U32 getCurBatchBeginPort(struct xgi_cmd_info * pCmdInfo)
static unsigned int getCurBatchBeginPort(struct xgi_cmd_info * pCmdInfo)
{
// Convert the batch type to begin port ID
switch (pCmdInfo->_firstBeginType) {

2
linux-core/xgi_cmdlist.h
View File

@ -65,7 +65,7 @@ struct xgi_cmdring_info {
U32 _cmdRingOffset;
};
extern int xgi_cmdlist_initialize(struct xgi_info * info, U32 size);
extern int xgi_cmdlist_initialize(struct xgi_info * info, size_t size);
extern void xgi_submit_cmdlist(struct xgi_info * info, struct xgi_cmd_info * pCmdInfo);

2
linux-core/xgi_linux.h
View File

@ -455,7 +455,7 @@ static inline void XGI_SET_PAGE_ATTRIB_CACHED(struct xgi_pte * page_ptr)
struct xgi_file_private {
struct xgi_info *info;
U32 num_events;
unsigned int num_events;
spinlock_t fp_lock;
wait_queue_head_t wait_queue;
};

2
linux-core/xgi_misc.c
View File

@ -109,7 +109,7 @@ void xgi_sarea_info(struct xgi_info * info, struct xgi_sarea_info * req)
*/
#define STALL_INTERRUPT_RESET_THRESHOLD 0xffff
static U32 s_invalid_begin = 0;
static unsigned int s_invalid_begin = 0;
bool xgi_ge_irq_handler(struct xgi_info * info)
{