diff for duplicates of <1198869450.10399.3.camel@amd3000> diff --git a/a/1.txt b/N1/1.txt index 74cfe1c..6537e1f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ Perches: > unsigned long timeout; > /* Wait to get busy first */ > timeout = jiffies + HZ * 60; -> - while (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) = 0) && (time_before(jiffies, timeout))) +> - while (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) == 0) && (time_before(jiffies, timeout))) > + while (!gdrom_is_busy() && (time_before(jiffies, timeout))) > cpu_relax(); > /* Now wait for busy to clear */ @@ -58,9 +58,9 @@ Perches: > gd.pending = 1; > gdrom_packetcommand(gd.cd_info, spin_command); > /* 60 second timeout */ -> - wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +> - wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); > + wait_event_interruptible_timeout(command_queue, -> + gd.pending = 0, HZ * 60); +> + gd.pending == 0, HZ * 60); > gd.pending = 0; > kfree(spin_command); > if (gd.status & 0x01) { @@ -68,9 +68,9 @@ Perches: > toc_command->buflen = tocsize; > gd.pending = 1; > gdrom_packetcommand(gd.cd_info, toc_command); -> - wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +> - wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); > + wait_event_interruptible_timeout(command_queue, -> + gd.pending = 0, HZ * 60); +> + gd.pending == 0, HZ * 60); > gd.pending = 0; > insw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2); > kfree(toc_command); @@ -121,9 +121,9 @@ Perches: > gd.pending = 1; > gdrom_packetcommand(gd.cd_info, sense_command); > /* 60 second timeout */ -> - wait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60); +> - wait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60); > + wait_event_interruptible_timeout(command_queue, -> + gd.pending = 0, HZ * 60); +> + gd.pending == 0, HZ * 60); > gd.pending = 0; > kfree(sense_command); > insw(PHYSADDR(GDROM_DATA_REG), &sense, 5); @@ -186,9 +186,9 @@ Perches: > cpu_relax(); > ctrl_outb(1, GDROM_DMA_STATUS_REG); > /* 5 second error margin here seems more reasonable */ -> - wait_event_interruptible_timeout(request_queue, gd.transfer = 0, HZ * 5); +> - wait_event_interruptible_timeout(request_queue, gd.transfer == 0, HZ * 5); > + wait_event_interruptible_timeout(request_queue, -> + gd.transfer = 0, HZ * 5); +> + gd.transfer == 0, HZ * 5); > err = ctrl_inb(GDROM_DMA_STATUS_REG); > err = gd.transfer; > gd.transfer = 0; diff --git a/a/content_digest b/N1/content_digest index 530c755..f04131c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01198796281.4833.31.camel@localhost\0" "From\0Gino Badouri <linuxsh@akelo.ath.cx>\0" "Subject\0Re: [PATCH] SH/Dreamcast - add support for GD-Rom device\0" - "Date\0Fri, 28 Dec 2007 19:17:30 +0000\0" + "Date\0Fri, 28 Dec 2007 20:17:30 +0100\0" "To\0Joe Perches <joe@perches.com>\0" "Cc\0Adrian McMenamin <adrian@newgolddream.dyndns.info>" Paul Mundt <lethal@linux-sh.org> @@ -62,7 +62,7 @@ "> \tunsigned long timeout;\n" "> \t/* Wait to get busy first */\n" "> \ttimeout = jiffies + HZ * 60;\n" - "> -\twhile (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) = 0) && (time_before(jiffies, timeout)))\n" + "> -\twhile (((ctrl_inb(GDROM_ALTSTATUS_REG) & 0x80) == 0) && (time_before(jiffies, timeout)))\n" "> +\twhile (!gdrom_is_busy() && (time_before(jiffies, timeout)))\n" "> \t\tcpu_relax();\n" "> \t/* Now wait for busy to clear */\n" @@ -71,9 +71,9 @@ "> \tgd.pending = 1;\n" "> \tgdrom_packetcommand(gd.cd_info, spin_command);\n" "> \t/* 60 second timeout */\n" - "> -\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "> -\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "> +\twait_event_interruptible_timeout(command_queue,\n" - "> +\t\t\t\t\t gd.pending = 0, HZ * 60);\n" + "> +\t\t\t\t\t gd.pending == 0, HZ * 60);\n" "> \tgd.pending = 0;\n" "> \tkfree(spin_command);\n" "> \tif (gd.status & 0x01) {\n" @@ -81,9 +81,9 @@ "> \ttoc_command->buflen = tocsize;\n" "> \tgd.pending = 1;\n" "> \tgdrom_packetcommand(gd.cd_info, toc_command);\n" - "> -\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "> -\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "> +\twait_event_interruptible_timeout(command_queue,\n" - "> +\t\t\t\t\t gd.pending = 0, HZ * 60);\n" + "> +\t\t\t\t\t gd.pending == 0, HZ * 60);\n" "> \tgd.pending = 0;\n" "> \tinsw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2);\n" "> \tkfree(toc_command);\n" @@ -134,9 +134,9 @@ "> \tgd.pending = 1;\n" "> \tgdrom_packetcommand(gd.cd_info, sense_command);\n" "> \t/* 60 second timeout */\n" - "> -\twait_event_interruptible_timeout(command_queue, gd.pending = 0, HZ * 60);\n" + "> -\twait_event_interruptible_timeout(command_queue, gd.pending == 0, HZ * 60);\n" "> +\twait_event_interruptible_timeout(command_queue,\n" - "> +\t\t\t\t\t gd.pending = 0, HZ * 60);\n" + "> +\t\t\t\t\t gd.pending == 0, HZ * 60);\n" "> \tgd.pending = 0;\n" "> \tkfree(sense_command);\n" "> \tinsw(PHYSADDR(GDROM_DATA_REG), &sense, 5);\n" @@ -199,9 +199,9 @@ "> \t\t\tcpu_relax();\n" "> \t\tctrl_outb(1, GDROM_DMA_STATUS_REG);\n" "> \t\t/* 5 second error margin here seems more reasonable */\n" - "> -\t\twait_event_interruptible_timeout(request_queue, gd.transfer = 0, HZ * 5);\n" + "> -\t\twait_event_interruptible_timeout(request_queue, gd.transfer == 0, HZ * 5);\n" "> +\t\twait_event_interruptible_timeout(request_queue,\n" - "> +\t\t\t\t\t\t gd.transfer = 0, HZ * 5);\n" + "> +\t\t\t\t\t\t gd.transfer == 0, HZ * 5);\n" "> \t\terr = ctrl_inb(GDROM_DMA_STATUS_REG);\n" "> \t\terr = gd.transfer;\n" "> \t\tgd.transfer = 0;\n" @@ -293,4 +293,4 @@ "Tested on the \"sh-2.6\" git kernel using two different GD-Rom drives.\n" Both commercial gd-rom's and cd-r's can be mounted. -8927cbe7131d4f7a7c3e8db98493dabd160429262334cc0d6ee5bc64a3f4b7d3 +ce439391fbfc74b4d21c4f6d6d6f319917e9b38822b94c8ffe584bc5f0b3b683
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.