Skip to content

Commit

Permalink
Merge pull request #1730 from ghaerr/dir
Browse files Browse the repository at this point in the history 
[direct floppy] Ifdef clear DIR media change code out of normal compilation
  • Loading branch information
@ghaerr
ghaerr authored Sep 21, 2023
2 parents aaba9a8 + ac5807c commit d64f195
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 40 deletions.
40 changes: 22 additions & 18 deletions elks/arch/i86/drivers/block/directfd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
* that we're using BIOS HD + DIRECT FD + XMS buffers + TRACK cache,
* which really should not happen. IOW - use either BIOS block IO or DIRECT block IO,
* don't mix!!
* - Update DMA code
* - Test density detection logic & floppy change detection
* - Clean up debug output
*/
Expand Down Expand Up @@ -117,6 +116,9 @@
* 82077AA IBM PS/2 (gen 3) DOR,DIR,CCR PERPENDICULAR,LOCK
*/

#define CHECK_DISK_CHANGE 0 /* =1 to add driver media changed code */
#define CLEAR_DIR_REG 0 /* =1 to clear DIR DSKCHG when set (for media change) */

//#define DEBUG printk
#define DEBUG(...)

Expand Down Expand Up @@ -231,13 +233,6 @@ struct floppy_struct *base_type[4];
*/
static int probing;

/*
* (User-provided) media information is _not_ discarded after a media change
* if the corresponding keep_data flag is non-zero. Positive values are
* decremented after each probe.
*/
static int keep_data[4];

/* device reference counters */
static int fd_ref[4];

Expand Down Expand Up @@ -426,15 +421,13 @@ void request_done(int uptodate)
end_request(uptodate);
}

#ifdef CHECK_DISK_CHANGE
#if CHECK_DISK_CHANGE
/*
* The check_media_change entry in struct file_operations (fs.h) is not
* part of the 'normal' setup (only BLOAT_FS), so we're ignoring it for now,
* assuming the user is smart enough to umount before media changes - or
* ready for the consequences.
*/

/*
*
* floppy-change is never called from an interrupt, so we can relax a bit
* here, sleep etc. Note that floppy-on tries to set current_DOR to point
* to the desired drive, but it will probably not survive the sleep if
Expand Down Expand Up @@ -924,11 +917,9 @@ static void reset_interrupt(void)
output_byte(FD_SENSEI);
(void) result();
}
//DEBUG("1-");
output_byte(FD_SPECIFY);
output_byte(cur_spec1); /* hut etc */
output_byte(6); /* Head load time =6ms, DMA */
//DEBUG("2-");
configure_fdc_mode(); /* reprogram fdc */
if (initial_reset_flag) {
initial_reset_flag = 0;
Expand Down Expand Up @@ -959,7 +950,7 @@ static void DFPROC reset_floppy(void)
need_configure = 1;
if (!initial_reset_flag)
printk("df: reset_floppy called\n");
clr_irq();
clr_irq(); /* FIXME don't busyloop with interrupts off, use timer */
outb_p(current_DOR & ~0x04, FD_DOR);
delay_loop(1000);
outb(current_DOR, FD_DOR);
Expand All @@ -977,6 +968,7 @@ static void floppy_shutdown(void)
redo_fd_request();
}

#if CLEAR_DIR_REG
static void shake_done(void)
{
/* Need SENSEI to clear the interrupt per spec, required by QEMU, not by
Expand Down Expand Up @@ -1029,12 +1021,23 @@ static void shake_one(void)
output_byte(1);
}

/*
* (User-provided) media information is _not_ discarded after a media change
* if the corresponding keep_data flag is non-zero. Positive values are
* decremented after each probe.
*/
static int keep_data[4];
#endif /* CLEAR_DIR_REG */

static void DFPROC floppy_ready(void)
{
DEBUG("RDY0x%x,%d,%d-", inb(FD_DIR), reset, recalibrate);

#if CLEAR_DIR_REG
/* check if disk changed since last cmd (PC/AT+) */
if (fdc_version >= FDC_TYPE_8272PC_AT && (inb(FD_DIR) & 0x80)) {
#ifdef CHECK_DISK_CHANGE

#if CHECK_DISK_CHANGE
changed_floppies |= 1 << current_drive;
#endif
buffer_track = -1;
Expand Down Expand Up @@ -1063,6 +1066,7 @@ static void DFPROC floppy_ready(void)
return;
}
}
#endif

if (reset) {
reset_floppy();
Expand Down Expand Up @@ -1119,7 +1123,7 @@ static void DFPROC redo_fd_request(void)
}
}
DEBUG("[%u]redo-%c %d(%s) bl %u;", (unsigned int)jiffies,
req->rq_cmd == WRITE? 'W':'R', device, floppy->name, req->rq_sector);
req->rq_cmd == WRITE? 'W':'R', device, floppy->name, req->rq_sector);
DEBUG("df%d: %c sector %ld\n", DEVICE_NR(req->rq_dev),

req->rq_cmd==WRITE? 'W' : 'R', req->rq_sector);
Expand Down Expand Up @@ -1336,7 +1340,7 @@ static int floppy_open(struct inode *inode, struct file *filp)
drive = MINOR(inode->i_rdev) >> MINOR_SHIFT;
dev = drive & 3;

#ifdef CHECK_DISK_CHANGE
#if CHECK_DISK_CHANGE
if (filp && filp->f_mode)
check_disk_change(inode->i_rdev);
#endif
Expand Down
23 changes: 11 additions & 12 deletions elks/arch/i86/drivers/block/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <linuxmt/kernel.h>
#include <linuxmt/errno.h>
#include <linuxmt/debug.h>
#include <linuxmt/fd.h> /* for DFPROC */
#include <arch/dma.h>
#include <arch/system.h>

Expand Down Expand Up @@ -66,7 +65,7 @@ static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = {
__ret; \
} )

int DFPROC request_dma(unsigned char dma, const char *device)
int request_dma(unsigned char dma, const char *device)
{
if (dma >= MAX_DMA_CHANNELS)
return -EINVAL;
Expand All @@ -80,7 +79,7 @@ int DFPROC request_dma(unsigned char dma, const char *device)
return 0;
} /* request_dma */

void DFPROC free_dma(unsigned char dma)
void free_dma(unsigned char dma)
{
if (dma >= MAX_DMA_CHANNELS)
debug("Trying to free DMA%u\n", dma);
Expand All @@ -90,7 +89,7 @@ void DFPROC free_dma(unsigned char dma)

/* enable/disable a specific DMA channel */

void DFPROC enable_dma(unsigned char dma)
void enable_dma(unsigned char dma)
{
if (dma >= MAX_DMA_CHANNELS)
debug("Trying to enable DMA%u\n", dma);
Expand All @@ -100,7 +99,7 @@ void DFPROC enable_dma(unsigned char dma)
dma_outb(dma & 3, DMA2_MASK_REG);
}

void DFPROC disable_dma(unsigned char dma)
void disable_dma(unsigned char dma)
{
if (dma >= MAX_DMA_CHANNELS)
debug("Trying to disable DMA%u\n", dma);
Expand All @@ -118,7 +117,7 @@ void DFPROC disable_dma(unsigned char dma)
* --- only be used while interrupts are disabled! ---
*/

void DFPROC clear_dma_ff(unsigned char dma)
void clear_dma_ff(unsigned char dma)
{
if (dma >= MAX_DMA_CHANNELS)
debug("Trying to disable DMA%u\n", dma);
Expand All @@ -130,7 +129,7 @@ void DFPROC clear_dma_ff(unsigned char dma)

/* set mode (above) for a specific DMA channel */

void DFPROC set_dma_mode(unsigned char dma, unsigned char mode)
void set_dma_mode(unsigned char dma, unsigned char mode)
{
if (dma >= MAX_DMA_CHANNELS)
debug("Trying to disable DMA%u\n", dma);
Expand All @@ -146,7 +145,7 @@ void DFPROC set_dma_mode(unsigned char dma, unsigned char mode)
* boundary may have been crossed.
*/

void DFPROC set_dma_page(unsigned char dma, unsigned char page)
void set_dma_page(unsigned char dma, unsigned char page)
{
switch (dma) {
case 0:
Expand Down Expand Up @@ -177,7 +176,7 @@ void DFPROC set_dma_page(unsigned char dma, unsigned char page)
* Assumes dma flipflop is clear.
*/

void DFPROC set_dma_addr(unsigned char dma, unsigned long addr)
void set_dma_addr(unsigned char dma, unsigned long addr)
{
set_dma_page(dma, (long)addr >> 16);
if (dma <= 3) {
Expand All @@ -198,7 +197,7 @@ void DFPROC set_dma_addr(unsigned char dma, unsigned long addr)
* NOTE 2: "count" represents _bytes_ and must be even for channels 5-7.
*/

void DFPROC set_dma_count(unsigned char dma, unsigned int count)
void set_dma_count(unsigned char dma, unsigned int count)
{
count--;
if (dma <= 3) {
Expand All @@ -220,7 +219,7 @@ void DFPROC set_dma_count(unsigned char dma, unsigned int count)
* Assumes DMA flip-flop is clear.
*/

int DFPROC get_dma_residue(unsigned char dma)
int get_dma_residue(unsigned char dma)
{
unsigned int io_port = (dma <= 3) ? (dma << 1) + 1 + IO_DMA1_BASE
: ((dma & 3) << 2) + 2 + IO_DMA2_BASE;
Expand All @@ -233,7 +232,7 @@ int DFPROC get_dma_residue(unsigned char dma)
return (dma <= 3) ? count : (count << 1);
}

int DFPROC get_dma_list(char *buf)
int get_dma_list(char *buf)
{
int i, len = 0;

Expand Down
20 changes: 10 additions & 10 deletions elks/include/arch/dma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
#define DMA_MODE_CASCADE 0xC0 /* pass thru DREQ->HRQ, DACK<-HLDA only */

/* These are in dma.c */
extern void DFPROC enable_dma(unsigned char);
extern void DFPROC disable_dma(unsigned char);
extern void DFPROC clear_dma_ff(unsigned char);
extern void DFPROC set_dma_mode(unsigned char,unsigned char);
extern void DFPROC set_dma_page(unsigned char,unsigned char);
extern void DFPROC set_dma_addr(unsigned char,unsigned long);
extern void DFPROC set_dma_count(unsigned char,unsigned int);
extern int DFPROC get_dma_residue(unsigned char);
extern int DFPROC request_dma(unsigned char,const char *);
extern void DFPROC free_dma(unsigned char);
extern void enable_dma(unsigned char);
extern void disable_dma(unsigned char);
extern void clear_dma_ff(unsigned char);
extern void set_dma_mode(unsigned char,unsigned char);
extern void set_dma_page(unsigned char,unsigned char);
extern void set_dma_addr(unsigned char,unsigned long);
extern void set_dma_count(unsigned char,unsigned int);
extern int get_dma_residue(unsigned char);
extern int request_dma(unsigned char,const char *);
extern void free_dma(unsigned char);

#endif

0 comments on commit d64f195

Please sign in to comment.