mplayer.hg: vidix/mga_vid.c comparison

comparison vidix/mga_vid.c @ 26753:502f04b67653

cosmetics: Remove useless parentheses from return statements.

author	diego
date	Fri, 16 May 2008 00:13:03 +0000
parents	3abd1629658b
children	df448e1248b2

comparison

equal deleted inserted replaced

-:65f61607e32f
+:502f04b67653
 #ifdef CRTC2
 	crtc2_frame_sel(mga_next_frame);
 #endif
 }
-return(0);
+return 0;
 }
 static void mga_vid_write_regs(int restore)
 {
 dw, dh, x, y, sw, sh, config->fourcc);
 if ((sw < 4) || (sh < 4) || (dw < 4) || (dh < 4))
 {
 printf("[mga] Invalid src/dest dimensions\n");
-return(EINVAL);
+return EINVAL;
 }
 //FIXME check that window is valid and inside desktop
 sw+=sw&1;
 	case IMGFMT_UYVY:
 	    config->frame_size = ((sw + 31) & ~31) * sh * 2;
 	    break;
 	default:
 	    printf("[mga] Unsupported pixel format: %x\n", config->fourcc);
-	    return(ENOTSUP);
+	    return ENOTSUP;
 }
 config->offsets[0] = 0;
 for (i = 1; i < config->num_frames+1; i++)
 	config->offsets[i] = i*config->frame_size;
 mga_src_base = (mga_ram_size*0x100000-config->num_frames*config->frame_size);
 if (mga_src_base < 0)
 {
 	printf("[mga] not enough memory for frames!\n");
-	return(EFAULT);
+	return EFAULT;
 }
 mga_src_base &= (~0xFFFF); /* 64k boundary */
 if (mga_verbose > 1) printf("[mga] YUV buffer base: %#x\n", mga_src_base);
 config->dga_addr = mga_mem_base + mga_src_base;
 cregs.c2vparam=((vdispend - 1) << 16) | (vtotal - 1);
 cregs.c2vsync=((vsyncend - 1) << 16) | (vsyncstart - 1);
 #endif /* CRTC2 */
 mga_vid_write_regs(0);
-return(0);
+return 0;
 }
 static int mga_playback_on(void)
 {
 if (mga_verbose) printf("[mga] playback on\n");
 if (mga_irq != -1)
 	enable_irq();
 #endif
 mga_next_frame=0;
-return(0);
+return 0;
 }
 static int mga_playback_off(void)
 {
 if (mga_verbose) printf("[mga] playback off\n");
 #endif
 regs.besctl &= ~1;
 regs.besglobctl &= ~(1<<6); /* UYVY format selected */
 mga_vid_write_regs(0);
-return(0);
+return 0;
 }
 static int mga_probe(int verbose,int force)
 {
 	pciinfo_t lst[MAX_PCI_DEVICES];
 	err = pci_scan(lst, &num_pci);
 	if (err)
 	{
 	    printf("[mga] Error occurred during pci scan: %s\n", strerror(err));
-	    return(err);
+	    return err;
 	}
 	if (mga_verbose)
 	    printf("[mga] found %d pci devices\n", num_pci);
 	}
 	if (is_g400 == -1)
 	{
 		if (verbose) printf("[mga] Can't find chip\n");
-		return(ENXIO);
+		return ENXIO;
 	}
 card_found:
 	probed = 1;
 	memcpy(&pci_info, &lst[i], sizeof(pciinfo_t));
 	mga_cap.device_id = pci_info.device; /* set device id in capabilites */
-	return(0);
+	return 0;
 }
 static int mga_init(void)
 {
 unsigned int card_option = 0;
 #endif
 if (!probed)
 {
 	printf("[mga] driver was not probed but is being initializing\n");
-	return(EINTR);
+	return EINTR;
 }
 #ifdef MGA_PCICONFIG_MEMDETECT
 pci_config_read(pci_info.bus, pci_info.card, pci_info.func,
 0x40, 4, &card_option);
 if (mga_ram_size)
 {
 	if ((mga_ram_size < 4) || (mga_ram_size > 64))
 	{
 	    printf("[mga] invalid RAMSIZE: %d MB\n", mga_ram_size);
-	    return(EINVAL);
+	    return EINVAL;
 	}
 }
 if (mga_verbose > 1) printf("[mga] hardware addresses: mmio: %#x, framebuffer: %#x\n",
 pci_info.base1, pci_info.base0);
 #else
 	printf("syncfb (mga): IRQ disabled in mga_vid.c\n");
 	mga_irq=-1;
 #endif
-return(0);
+return 0;
 }
 static void mga_destroy(void)
 {
 if (mga_verbose) printf("[mga] destroy\n");
 	case IMGFMT_YUY2:
 	case IMGFMT_UYVY:
 	    break;
 	default:
 	    to->depth = to->flags = 0;
-	    return(ENOTSUP);
+	    return ENOTSUP;
 }
 to->depth = VID_DEPTH_12BPP |
 		VID_DEPTH_15BPP | VID_DEPTH_16BPP |
 		VID_DEPTH_24BPP | VID_DEPTH_32BPP;
 to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY;
-return(0);
+return 0;
 }
 static int mga_get_caps(vidix_capability_t *to)
 {
 memcpy(to, &mga_cap, sizeof(vidix_capability_t));
-return(0);
+return 0;
 }
 static int mga_get_gkeys(vidix_grkey_t *grkey)
 {
 memcpy(grkey, &mga_grkey, sizeof(vidix_grkey_t));
-return(0);
+return 0;
 }
 static int mga_set_gkeys(const vidix_grkey_t *grkey)
 {
 memcpy(&mga_grkey, grkey, sizeof(vidix_grkey_t));
 mga_vid_write_regs(0);
-return(0);
+return 0;
 }
 static int mga_set_eq( const vidix_video_eq_t * eq)
 {
 /* contrast and brightness control isn't supported on G200 - alex */
 if (!is_g400)
 {
 	if (mga_verbose) printf("[mga] equalizer isn't supported with G200\n");
-	return(ENOTSUP);
+	return ENOTSUP;
 }
 // only brightness&contrast are supported:
 if(!(eq->cap & (VEQ_CAP_BRIGHTNESS|VEQ_CAP_CONTRAST)))
-	return(ENOTSUP);
+	return ENOTSUP;
 //regs.beslumactl = readl(mga_mmio_base + BESLUMACTL);
 if (eq->cap & VEQ_CAP_BRIGHTNESS) {
 	regs.beslumactl &= 0xFFFF;
 	regs.beslumactl |= (eq->brightness*255/2000)<<16;
 	regs.beslumactl &= 0xFFFF0000;
 	regs.beslumactl |= (128+eq->contrast*255/2000)&0xFFFF;
 }
 writel(regs.beslumactl,mga_mmio_base + BESLUMACTL);
-return(0);
+return 0;
 }
 static int mga_get_eq( vidix_video_eq_t * eq)
 {
 /* contrast and brightness control isn't supported on G200 - alex */
 if (!is_g400)
 {
 	if (mga_verbose) printf("[mga] equalizer isn't supported with G200\n");
-	return(ENOTSUP);
+	return ENOTSUP;
 }
 eq->brightness = (signed short int)(regs.beslumactl >> 16) * 1000 / 128;
 eq->contrast = (signed short int)(regs.beslumactl & 0xFFFF) * 1000 / 128 - 1000;
 eq->cap = VEQ_CAP_BRIGHTNESS | VEQ_CAP_CONTRAST;
 printf("MGA GET_EQ: br=%d c=%d  \n",eq->brightness,eq->contrast);
-return(0);
+return 0;
 }
 #ifndef CRTC2
 VDXDriver mga_drv = {
 "mga",

Mercurial > mplayer.hg

comparison vidix/mga_vid.c @ 26753:502f04b67653