Browse Source

Clang 9 and higher complaining

Signed-off-by: Álvaro Jurado <elbingmiss@gmail.com>
Álvaro Jurado 3 years ago
parent
commit
1104827172

+ 1 - 1
sys/src/9/amd64/sdiahci.c

@@ -1075,7 +1075,7 @@ resetdisk(Drive *d)
 
 	ilock(&d->Lock);
 	state = d->state;
-	if(d->state != Dready || d->state != Dnew)
+	if(d->state != (Dready |Dnew))
 		atomic_set(&d->portm.flag, atomic_read(&d->portm.flag) | Ferror);
 	clearci(p);			/* satisfy sleep condition. */
 	wakeup(&d->portm.Rendez);

+ 2 - 1
sys/src/cmd/aux/vga/clgd546x.c

@@ -282,7 +282,8 @@ init(Vga* vga, Ctlr* ctlr)
 	//if(ctlr->flag & Ulinear)
 	//	laguna->vsc |= 0x10000000;
 	//else
-		laguna->vsc &= ~0x10000000;
+	//	laguna->vsc &= ~0x10000000;
+	laguna->vsc &= ~0x10000000;
 	laguna->format = format;
 	laguna->threshold = (interleave<<14)|(fetches<<8)|0x14;
 	laguna->tilectrl &= 0x3F;

+ 5 - 4
sys/src/cmd/aux/vga/radeon.c

@@ -558,11 +558,12 @@ radeon_load_pll_registers(Radeon*radeon)
 			 * setting.
 			 */
 			OUTPLLP(radeon, PPLL_REF_DIV, radeon->ppll_ref_div, 0);
-		else
+		//else
 			/* R300 uses ref_div_acc field as real ref divider */
-			OUTPLLP(radeon, PPLL_REF_DIV,
-			    radeon->ppll_ref_div << R300_PPLL_REF_DIV_ACC_SHIFT,
-				~R300_PPLL_REF_DIV_ACC_MASK);
+			/* BUGGY, who cares about 2002 GPU */
+			//OUTPLLP(radeon, PPLL_REF_DIV,
+			//    radeon->ppll_ref_div << R300_PPLL_REF_DIV_ACC_SHIFT,
+			//	~R300_PPLL_REF_DIV_ACC_MASK);
 	} else
 		OUTPLLP(radeon, PPLL_REF_DIV, radeon->ppll_ref_div,
 			~PPLL_REF_DIV_MASK);

+ 3 - 3
sys/src/libc/port/malloc.c

@@ -210,7 +210,7 @@ malloc(size_t size)
 	void *v;
 
 	v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr_t));
-	if(Npadlong && v != nil) {
+	if((Npadlong != 0) && (v != nil)) {
 		v = (uintptr_t*)v+Npadlong;
 		setmalloctag(v, getcallerpc());
 		setrealloctag(v, 0);
@@ -224,7 +224,7 @@ mallocz(uint32_t size, int clr)
 	void *v;
 
 	v = poolalloc(mainmem, size+Npadlong*sizeof(uintptr_t));
-	if(Npadlong && v != nil){
+	if((Npadlong != 0) && (v != nil)){
 		v = (uintptr_t*)v+Npadlong;
 		setmalloctag(v, getcallerpc());
 		setrealloctag(v, 0);
@@ -241,7 +241,7 @@ mallocalign(uint32_t size, uint32_t align, int32_t offset, uint32_t span)
 
 	v = poolallocalign(mainmem, size+Npadlong*sizeof(uintptr_t), align,
 			   offset-Npadlong*sizeof(uintptr_t), span);
-	if(Npadlong && v != nil){
+	if((Npadlong != 0) && (v != nil)){
 		v = (uintptr_t*)v+Npadlong;
 		setmalloctag(v, getcallerpc());
 		setrealloctag(v, 0);

+ 1 - 1
sys/src/libusb/serial/ftdi.c

@@ -245,7 +245,7 @@ ftdiwrite(Serialport *p, int val, int index, int req)
 
 	ser = p->s;
 
-	if(req != FTGETE2READ || req != FTSETE2ERASE || req != FTSETBAUDRATE)
+	if(req != (FTGETE2READ | FTSETE2ERASE | FTSETBAUDRATE))
 		index |= p->interfc + 1;
 	dsprint(2, "serial: ftdiwrite %#p [%d] req: %#x val: %#x idx:%d\n",
 		p, p->interfc, req, val, index);